vona-core 5.0.101 → 5.0.103

package/dist/lib/bean/resource/config/type.d.ts

@@ -1,2 +1,3 @@
-import type { VonaApplication } from '../../../../index.ts';
-export type TypeModuleConfig<T extends (app: VonaApplication) => object> = ReturnType<T>;
+import type { VonaConfigEnv } from '../../../../types/utils/env.ts';
+import type { VonaApplication } from '../../../core/application.ts';
+export type TypeModuleConfig<T extends (app: VonaApplication, env: VonaConfigEnv) => object> = ReturnType<T>;

package/dist/lib/bean/resource/locale/appLocale.d.ts

@@ -3,5 +3,7 @@ import { BeanSimple } from '../../beanSimple.ts';
 export declare class AppLocale extends BeanSimple {
     get current(): keyof ILocaleRecord;
     set current(value: keyof ILocaleRecord);
+    get tz(): string | undefined;
+    set tz(value: string | undefined);
     getText<T extends keyof ILocaleRecord>(supportCustomMessage: boolean, moduleScope: string | undefined, locale: T | undefined, key: string, ...args: any[]): string;
 }

package/dist/lib/bean/resource/locale/appLocale.js

@@ -8,6 +8,12 @@ export class AppLocale extends BeanSimple {
     set current(value) {
         this.ctx.locale = value;
     }
+    get tz() {
+        return this.ctx.tz;
+    }
+    set tz(value) {
+        this.ctx.tz = value;
+    }
     /** @internal */
     createLocaleText(moduleScope) {
         const self = this;

package/dist/lib/core/application.js

@@ -4,7 +4,6 @@ import { cast } from "../../types/utils/cast.js";
 import { BeanContainer } from "../bean/beanContainer.js";
 import { closeApp } from "../framework/useApp.js";
 import { AppUtil } from "../utils/util.js";
-import { zodEnhance } from "../utils/zod-enhance.js";
 import { VonaAsyncLocalStorage } from "./asyncLocalStorage.js";
 import { contextBase } from "./context.js";
 import { AppMeta } from "./meta.js";
@@ -20,16 +19,10 @@ export class VonaApplication extends KoaApplication {
         const env = options.env;
         const koaOptions = {
             env: cast(env).NODE_ENV,
-            keys: options.config.server.keys,
-            proxy: options.config.proxy.enable,
-            subdomainOffset: options.config.server.subdomainOffset,
-            proxyIpHeader: options.config.proxy.ipHeaders,
-            maxIpsCount: options.config.proxy.maxIpsCount,
             asyncLocalStorage: false,
         };
         super(koaOptions);
         this.options = options;
-        this.config = options.config;
         this.bean = BeanContainer.create(this, undefined);
         this.util = this.bean._newBean(AppUtil);
         this.meta = this.bean._newBean(AppMeta, env);
@@ -40,8 +33,6 @@ export class VonaApplication extends KoaApplication {
             const desc = Object.getOwnPropertyDescriptor(contextBase, key);
             Object.defineProperty(this.context, key, desc);
         }
-        // zod
-        zodEnhance(this);
     }
     get name() {
         return this.options.name;

package/dist/lib/core/config.d.ts

@@ -1,15 +1,7 @@
-import type { VonaAppInfo } from '../../types/application/app.ts';
-import type { VonaConfigOptional } from '../../types/config/config.ts';
-import type { VonaConfigEnv } from '../../types/utils/env.ts';
 import type { PowerPartial } from '../../types/utils/powerPartial.ts';
 import type { VonaApplication } from './application.ts';
-export declare function combineAppConfigDefault(appInfo: VonaAppInfo, env: VonaConfigEnv): PowerPartial<import("../../types/config/config.ts").VonaConfig>;
-export declare function configDefault(_appInfo: VonaAppInfo, _env: VonaConfigEnv): VonaConfigOptional;
-export declare function configDev(_env: VonaConfigEnv): VonaConfigOptional;
-export declare function configProd(_env: VonaConfigEnv): VonaConfigOptional;
-export declare function configTest(_env: VonaConfigEnv): VonaConfigOptional;
 export type TypeConfigLoader<T> = (app: VonaApplication) => Promise<PowerPartial<T>>;
 export declare function combineConfigDefault<T>(app: VonaApplication, configDefault: TypeConfigLoader<T>, configDev?: TypeConfigLoader<T>, configProd?: TypeConfigLoader<T>, configTest?: TypeConfigLoader<T>): Promise<PowerPartial<T>>;
-export declare function getLoggerPathPhysicalRoot(appInfo: VonaAppInfo): string;
-export declare function getPublicPathPhysicalRoot(appInfo: VonaAppInfo): string;
+export declare function getLoggerPathPhysicalRoot(app: VonaApplication): string;
+export declare function getPublicPathPhysicalRoot(app: VonaApplication): string;
 export declare function getRuntimePathPhysicalRoot(app: VonaApplication): string;

package/dist/lib/core/config.js

@@ -2,34 +2,8 @@ import os from 'node:os';
 import path from 'node:path';
 import fse from 'fs-extra';
 import { deepExtend } from "../utils/util.js";
-export function combineAppConfigDefault(appInfo, env) {
-    let config = configDefault(appInfo, env);
-    const mode = appInfo.configMeta.mode;
-    if (mode === 'dev') {
-        config = deepExtend(config, configDev(env));
-    }
-    else if (mode === 'prod') {
-        config = deepExtend(config, configProd(env));
-    }
-    else if (mode === 'test') {
-        config = deepExtend(config, configTest(env));
-    }
-    return config;
-}
-export function configDefault(_appInfo, _env) {
-    return {};
-}
-export function configDev(_env) {
-    return {};
-}
-export function configProd(_env) {
-    return {};
-}
-export function configTest(_env) {
-    return {};
-}
 export async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
-    let config = await configDefault(app);
+    let config = (await configDefault(app));
     const mode = app.config.meta.mode;
     if (mode === 'dev' && configDev) {
         config = deepExtend(config, await configDev(app));
@@ -42,26 +16,26 @@ export async function combineConfigDefault(app, configDefault, configDev, config
     }
     return config;
 }
-export function getLoggerPathPhysicalRoot(appInfo) {
-    const mode = appInfo.configMeta.mode;
+export function getLoggerPathPhysicalRoot(app) {
+    const mode = app.configMeta.mode;
     let loggerDir;
     if (mode === 'test' || mode === 'dev') {
-        loggerDir = path.join(appInfo.projectPath, '.app/logs');
+        loggerDir = path.join(app.projectPath, '.app/logs');
     }
     else {
-        loggerDir = path.join(os.homedir(), 'vona', appInfo.name, 'logs');
+        loggerDir = path.join(os.homedir(), 'vona', app.name, 'logs');
     }
     fse.ensureDirSync(loggerDir);
     return loggerDir;
 }
-export function getPublicPathPhysicalRoot(appInfo) {
-    const mode = appInfo.configMeta.mode;
+export function getPublicPathPhysicalRoot(app) {
+    const mode = app.configMeta.mode;
     let publicDir;
     if (mode === 'test' || mode === 'dev') {
-        publicDir = path.join(appInfo.projectPath, '.app/public');
+        publicDir = path.join(app.projectPath, '.app/public');
     }
     else {
-        publicDir = path.join(os.homedir(), 'vona', appInfo.name, 'public');
+        publicDir = path.join(os.homedir(), 'vona', app.name, 'public');
     }
     fse.ensureDirSync(publicDir);
     return publicDir;

package/dist/lib/core/context.js

@@ -21,6 +21,14 @@ export const contextBase = {
         const self = cast(this);
         self.__setLocale(value);
     },
+    get tz() {
+        const self = cast(this);
+        return self.__getTz();
+    },
+    set tz(value) {
+        const self = cast(this);
+        self.__setTz(value);
+    },
     get instanceName() {
         const self = cast(this);
         return self.__getInstanceName();

package/dist/lib/core/meta.js

@@ -62,7 +62,7 @@ export class AppMeta extends BeanSimple {
         this.metadata = appMetadata;
     }
     _prepareEnv() {
-        const mode = this.app.config.meta.mode;
+        const mode = this.app.configMeta.mode;
         this.isProd = mode === 'prod';
         this.isTest = mode === 'test';
         this.isDev = mode === 'dev';

package/dist/lib/core/resource.js

@@ -131,6 +131,9 @@ export class AppResource extends BeanSimple {
     }
     _prepareOnionOptions(options, optionsPrimitive, scene, name) {
         const app = useApp();
+        if (!app?.config && scene !== 'scope') {
+            throw new Error('Should not import vona module in config');
+        }
         const optionsConfig = cast(app?.config)?.onions?.[scene]?.[name];
         if (optionsPrimitive) {
             return optionsConfig === undefined ? options : optionsConfig;

package/dist/lib/framework/createApp.js

@@ -1,8 +1,8 @@
 import { sleep } from '@cabloy/utils';
 import { cast } from "../../types/utils/cast.js";
 import { VonaApplication } from "../core/application.js";
-import { combineAppConfigDefault } from "../core/config.js";
-import { deepExtend, prepareEnv } from "../utils/util.js";
+import { prepareEnv } from "../utils/util.js";
+import { zodEnhance } from "../utils/zod-enhance.js";
 import { Start } from "./start.js";
 export async function createAppMaster(bootstrapOptions) {
     globalThis.__bootstrapOptions__ = bootstrapOptions;
@@ -42,12 +42,12 @@ export async function createApp(bootstrapOptions) {
     }
 }
 function __createApp({ modulesMeta, locales, config, env, AppMonkey }) {
+    // patch zod, should before config
+    zodEnhance();
     // env
     const env2 = prepareEnv(env);
     // appInfo
     const appInfo = prepareAppInfo(env2);
-    // config
-    const appConfig = prepareConfig(appInfo, config, env2);
     // options
     const options = {
         name: appInfo.name,
@@ -55,7 +55,7 @@ function __createApp({ modulesMeta, locales, config, env, AppMonkey }) {
         configMeta: appInfo.configMeta,
         modulesMeta,
         locales,
-        config: appConfig,
+        config,
         env: env2,
         AppMonkey,
     };
@@ -71,13 +71,3 @@ function prepareAppInfo(env) {
         },
     };
 }
-function prepareConfig(appInfo, configs, env) {
-    const config = combineAppConfigDefault(appInfo, env);
-    for (const configItem of configs) {
-        const res = configItem(appInfo, env);
-        if (res) {
-            deepExtend(config, res);
-        }
-    }
-    return config;
-}

package/dist/lib/framework/start.d.ts

@@ -7,4 +7,5 @@ export declare class Start {
     _start_appStart(): Promise<void>;
     _start_appReady(): Promise<void>;
     _start_appStarted(): Promise<void>;
+    _start_appConfig(): Promise<void>;
 }

package/dist/lib/framework/start.js

@@ -1,5 +1,6 @@
 import { EnumAppEvent } from "../../types/index.js";
 import { ModuleLoader } from "../module/loader.js";
+import { deepExtend } from "../utils/util.js";
 export class Start {
     app;
     constructor(app) {
@@ -8,6 +9,7 @@ export class Start {
     async start() {
         const app = this.app;
         try {
+            await this._start_appConfig();
             await this._start_appLoad();
             await this._start_appStart();
             await this._start_appReady();
@@ -48,4 +50,30 @@ export class Start {
         // hook: appStarted
         await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, 'appStarted');
     }
+    async _start_appConfig() {
+        const app = this.app;
+        // config
+        const appConfig = await __prepareConfig(app);
+        this.app.config = appConfig;
+        this.app.keys = appConfig.server.keys;
+        this.app.proxy = appConfig.proxy.enable;
+        this.app.subdomainOffset = appConfig.server.subdomainOffset;
+        this.app.proxyIpHeader = appConfig.proxy.ipHeaders;
+        this.app.maxIpsCount = appConfig.proxy.maxIpsCount;
+    }
+}
+async function __prepareConfig(app) {
+    const config = {};
+    const configItems = (await app.options.config()).default;
+    const configItemsPromise = [];
+    for (const configItem of configItems) {
+        configItemsPromise.push(configItem(app, app.options.env));
+    }
+    const configItemsRes = await Promise.all(configItemsPromise);
+    for (const configItem of configItemsRes) {
+        if (configItem) {
+            deepExtend(config, configItem);
+        }
+    }
+    return config;
 }

package/dist/lib/module/config.js

@@ -7,7 +7,7 @@ export default async function (app, modules) {
             const module = modules[key];
             // module config
             if (module.resource.config) {
-                const configModule = await module.resource.config(app);
+                const configModule = await module.resource.config(app, app.options.env);
                 // configNew is not used by now
                 await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, 'configLoaded', module, configModule);
                 app.config.modules[module.info.relativeName] = deepExtend({}, configModule, app.config.modules[module.info.relativeName]);

package/dist/lib/module/loader.js

@@ -16,7 +16,7 @@ export class ModuleLoader extends BeanSimple {
         // monkey modules
         await moduleTools.monkey('moduleLoading');
         await loadConfig(app, modules);
-        loadLocales(app, modules);
+        await loadLocales(app, modules);
         loadErrors(app, modules);
         loadConstants(app, modules);
         // monkey modules

package/dist/lib/module/locales.d.ts

@@ -1,3 +1,3 @@
 import type { IModule } from '@cabloy/module-info';
 import type { VonaApplication } from '../core/application.ts';
-export default function (app: VonaApplication, modules: Record<string, IModule>): void;
+export default function (app: VonaApplication, modules: Record<string, IModule>): Promise<void>;

package/dist/lib/module/locales.js

@@ -1,14 +1,15 @@
 import localesDefault from "../core/locales.js";
-export default function (app, modules) {
+export default async function (app, modules) {
     // all locales
     app.meta.locales = localesDefault;
     app.meta.localeModules = {};
     // load locales
-    loadLocales();
-    function loadLocales() {
+    await loadLocales();
+    async function loadLocales() {
+        const locales = (await app.options.locales()).locales;
         // project locales
-        for (const locale in app.options.locales) {
-            _initLocales(locale, app.options.locales[locale]);
+        for (const locale in locales) {
+            _initLocales(locale, locales[locale]);
         }
         // module locales
         for (const moduleName in modules) {

package/dist/lib/utils/customKey.d.ts

@@ -1,6 +1,7 @@
 import type { ILocaleRecord } from '../bean/resource/locale/type.ts';
 export interface ICustomKeyRecord {
     'x-vona-locale': keyof ILocaleRecord | undefined;
+    'x-vona-tz': string | undefined;
     'x-vona-instance-name': string | undefined;
     'x-vona-passport-code': string | undefined;
     'x-vona-oauth-code': string | undefined;

package/dist/lib/utils/index.d.ts

@@ -1,4 +1,3 @@
 export * from './customKey.ts';
-export * from './redis.ts';
 export * from './retry.ts';
 export * from './util.ts';

package/dist/lib/utils/index.js

@@ -1,6 +1,5 @@
 import { zodExtendOpenApi } from "./zod-openapi.js";
 export * from "./customKey.js";
-export * from "./redis.js";
 export * from "./retry.js";
 export * from "./util.js";
 zodExtendOpenApi();

package/dist/lib/utils/zod-enhance.d.ts

@@ -5,5 +5,5 @@ export type ZodLocaleError = () => {
     localeError: z.core.$ZodErrorMap;
 };
 export type ZodLocaleErrors = Record<keyof ILocaleRecord, ZodLocaleError>;
-export declare function zodEnhance(app: VonaApplication): void;
+export declare function zodEnhance(): void;
 export declare function zodSetLocaleErrors(app: VonaApplication, localeErrors: ZodLocaleErrors, localeDefault?: string): void;

package/dist/lib/utils/zod-enhance.js

@@ -1,8 +1,10 @@
 import { setLocaleAdapter, setLocaleErrors, translateError } from '@cabloy/zod-errors-custom';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { setParseAdapter } from '@cabloy/zod-query';
-export function zodEnhance(app) {
+import { useApp } from "../framework/useApp.js";
+export function zodEnhance() {
     setLocaleAdapter((text, iss) => {
+        const app = useApp();
         return translateError((text, ...args) => {
             return app.meta.text(text, ...args);
         }, text, iss);

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

@@ -1,5 +1,6 @@
 import type { IModule, VonaConfigMeta } from '@cabloy/module-info';
-import type { VonaConfig, VonaConfigOptional } from '../config/config.ts';
+import type { VonaApplication } from '../../lib/core/application.ts';
+import type { VonaConfigOptional } from '../config/config.ts';
 import type { VonaLocaleOptionalMap } from '../config/locale.ts';
 import type { AppMonkeyConstructable } from '../interface/monkey.ts';
 import type { VonaConfigEnv } from '../utils/env.ts';
@@ -7,9 +8,15 @@ export interface VonaModulesMeta {
     modules: Record<string, IModule>;
     moduleNames: string[];
 }
-export type TypeOptionsModulesMeta = () => Promise<{
+export type TypeBootstrapOptionsModulesMeta = () => Promise<{
     modulesMeta: VonaModulesMeta;
 }>;
+export type TypeBootstrapOptionsConfig = () => Promise<{
+    default: TypeAppInfoConfig[];
+}>;
+export type TypeBootstrapOptionsLocales = () => Promise<{
+    locales: VonaLocaleOptionalMap;
+}>;
 export interface KoaApplicationOptions {
     env?: string | undefined;
     keys?: string[] | undefined;
@@ -28,10 +35,10 @@ export interface VonaApplicationOptions {
     name: string;
     projectPath: string;
     configMeta: VonaConfigMeta;
-    modulesMeta: TypeOptionsModulesMeta;
-    locales: VonaLocaleOptionalMap;
-    config: VonaConfig;
+    modulesMeta: TypeBootstrapOptionsModulesMeta;
+    locales: TypeBootstrapOptionsLocales;
+    config: TypeBootstrapOptionsConfig;
     env: VonaConfigEnv;
     AppMonkey?: AppMonkeyConstructable;
 }
-export type TypeAppInfoConfig = (appInfo: VonaAppInfo, env: VonaConfigEnv) => VonaConfigOptional;
+export type TypeAppInfoConfig = (app: VonaApplication, env: VonaConfigEnv) => VonaConfigOptional | Promise<VonaConfigOptional>;

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

@@ -1,3 +1,4 @@
+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: {
@@ -7,4 +8,4 @@ export type VonaLocale = {
     modules: IBeanScopeLocale;
 } & typeof localeDefault;
 export type VonaLocaleOptional = PowerPartial<VonaLocale>;
-export type VonaLocaleOptionalMap = Record<string, VonaLocaleOptional>;
+export type VonaLocaleOptionalMap = Record<keyof ILocaleRecord, VonaLocaleOptional>;

package/dist/types/context/contextBase.d.ts

@@ -6,6 +6,8 @@ export interface ContextBase {
     get bean(): BeanContainer;
     get locale(): keyof ILocaleRecord;
     set locale(value: keyof ILocaleRecord);
+    get tz(): string | undefined;
+    set tz(value: string | undefined);
     get instanceName(): keyof IInstanceRecord | undefined | null;
     set instanceName(value: keyof IInstanceRecord | undefined | null);
     get config(): VonaConfig;

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

@@ -1,10 +1,9 @@
-import type { TypeAppInfoConfig, TypeOptionsModulesMeta } from '../application/app.ts';
-import type { VonaLocaleOptionalMap } from '../config/locale.ts';
+import type { TypeBootstrapOptionsConfig, TypeBootstrapOptionsLocales, TypeBootstrapOptionsModulesMeta } from '../application/app.ts';
 import type { AppMonkeyConstructable } from './monkey.ts';
 export interface BootstrapOptions {
-    modulesMeta: TypeOptionsModulesMeta;
-    locales: VonaLocaleOptionalMap;
-    config: TypeAppInfoConfig[];
+    modulesMeta: TypeBootstrapOptionsModulesMeta;
+    locales: TypeBootstrapOptionsLocales;
+    config: TypeBootstrapOptionsConfig;
     env: Partial<NodeJS.ProcessEnv>;
     AppMonkey?: AppMonkeyConstructable;
 }

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

@@ -1,11 +1,12 @@
 import type { VonaApplication } from '../../lib/core/application.ts';
 import type { Constructable } from '../../lib/decorator/type/constructable.ts';
+import type { VonaConfigEnv } from '../utils/env.ts';
 import type { IModuleMain, IMonkeyModule, IMonkeySystem } from './monkey.ts';
 export type TypeModuleResourceLocales = Record<string, object>;
 export type TypeModuleResourceLocaleModules = Record<string, TypeModuleResourceLocales>;
 export type TypeModuleResourceErrors = Record<string, number>;
 export type TypeModuleResourceErrorModules = Record<string, TypeModuleResourceErrors>;
-export type TypeModuleResourceConfig = (app: VonaApplication) => object | Promise<object>;
+export type TypeModuleResourceConfig = (app: VonaApplication, env: VonaConfigEnv) => object | Promise<object>;
 export interface IModuleResource {
     Main: new () => IModuleMain;
     Monkey: new () => IMonkeyModule & IMonkeySystem;

package/dist/types/utils/powerPartial.d.ts

@@ -1,5 +1,5 @@
-export type PowerPartial<T> = {
-    [U in keyof T]?: T[U] extends (...args: any) => any ? (...args: Parameters<T[U]>) => PowerPartialFunctionResult<ReturnType<T[U]>> : T[U] extends object ? PowerPartial<T[U]> : T[U];
-};
-type PowerPartialFunctionResult<T> = T extends Promise<infer R> ? Promise<PowerPartial<R>> : PowerPartial<T>;
-export {};
+import type { PartialDeep } from '@cabloy/type-fest';
+export type PowerPartial<T> = PartialDeep<T, {
+    recurseIntoArrays: true;
+    allowUndefinedInNonTupleArrays: false;
+}>;

package/dist/types/utils/powerPartial.js

@@ -1 +1,8 @@
 export {};
+// export type PowerPartial<T> = {
+//   [U in keyof T]?:
+//   T[U] extends (...args: any) => any
+//     ? (...args: Parameters<T[U]>) => PowerPartialFunctionResult<ReturnType<T[U]>>
+//     : T[U] extends object ? PowerPartial<T[U]> : T[U];
+// };
+// type PowerPartialFunctionResult<T> = T extends Promise<infer R> ? Promise<PowerPartial<R>> : PowerPartial<T>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.101",
+  "version": "5.0.103",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -32,10 +32,11 @@
     "@cabloy/module-info": "^1.3.31",
     "@cabloy/module-info-pro": "^1.0.39",
     "@cabloy/set": "^1.0.17",
-    "@cabloy/utils": "^1.0.47",
+    "@cabloy/type-fest": "^5.3.1",
+    "@cabloy/utils": "^1.0.48",
     "@cabloy/word-utils": "^2.0.1",
     "@cabloy/zod-errors-custom": "^2.0.3",
-    "@cabloy/zod-openapi": "^1.0.3",
+    "@cabloy/zod-openapi": "^1.0.6",
     "@cabloy/zod-query": "^2.0.3",
     "@cabloy/zod-to-openapi": "^8.1.4",
     "chalk": "^5.3.0",

package/dist/lib/utils/redis.d.ts

@@ -1,3 +0,0 @@
-import type { VonaAppInfo } from '../../types/application/app.ts';
-import type { VonaApplication } from '../core/application.ts';
-export declare function getRedisClientKeyPrefix(clientName: string, appInfo: VonaAppInfo | VonaApplication): string;

package/dist/lib/utils/redis.js

@@ -1,4 +0,0 @@
-export function getRedisClientKeyPrefix(clientName, appInfo) {
-    const mode = ['test', 'dev'].includes(appInfo.configMeta.mode) ? '_local' : '';
-    return `${clientName}_${appInfo.name}${mode}:`;
-}