vona-core 5.0.47 → 5.0.49

package/dist/lib/bean/beanSimple.d.ts

@@ -3,5 +3,5 @@ import type { VonaApplication } from '../core/application.ts';
 export declare class BeanSimple {
     protected app: VonaApplication;
     protected get ctx(): VonaContext;
-    protected get bean(): import("./beanContainer.ts").BeanContainer;
+    protected get bean(): import("vona").BeanContainer;
 }

package/dist/lib/core/application.js

@@ -4,6 +4,7 @@ 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";
@@ -39,6 +40,8 @@ export class VonaApplication extends KoaApplication {
             const desc = Object.getOwnPropertyDescriptor(contextBase, key);
             Object.defineProperty(this.context, key, desc);
         }
+        // zod
+        zodEnhance(this);
     }
     get ctx() {
         return this.currentContext;

package/dist/lib/core/context.js

@@ -57,6 +57,13 @@ export const contextBase = {
             return undefined;
         return controller.prototype;
     },
+    getControllerBean() {
+        const self = cast(this);
+        const beanFullName = self.getControllerBeanFullName();
+        if (!beanFullName)
+            return;
+        return self.app.bean._getBean(beanFullName);
+    },
     getControllerBeanFullName() {
         const self = cast(this);
         const controller = self.getController();

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

@@ -14,6 +14,7 @@ export declare class AppMeta extends BeanSimple {
     isProd: boolean;
     isTest: boolean;
     isDev: boolean;
+    isLocal: boolean;
     error: ErrorClass;
     logger: AppLogger;
     locale: AppLocale;

package/dist/lib/core/meta.js

@@ -13,6 +13,7 @@ export class AppMeta extends BeanSimple {
     isProd;
     isTest;
     isDev;
+    isLocal;
     error;
     logger;
     locale;
@@ -66,6 +67,7 @@ export class AppMeta extends BeanSimple {
         this.isProd = mode === 'prod';
         this.isTest = mode === 'test';
         this.isDev = mode === 'dev';
+        this.isLocal = this.isTest || this.isDev;
     }
     async waitAppStarted() {
         return new Promise((resolve, reject) => {

package/dist/lib/framework/useApp.js

@@ -31,6 +31,11 @@ export async function closeApp(terminate) {
     }
 }
 export async function createGeneralApp(projectPath, envRuntime) {
+    if (envRuntime) {
+        for (const key of Object.keys(envRuntime)) {
+            process.env[key] = envRuntime[key];
+        }
+    }
     if (process.env.META_MODE === 'prod') {
         const testFile = path.join(projectPath, `dist/${process.env.META_FLAVOR}/bootstrap.js`);
         const testInstance = await import(__rewriteRelativeImportExtension(pathToHref(testFile)));
@@ -39,7 +44,7 @@ export async function createGeneralApp(projectPath, envRuntime) {
     else {
         const testFile = path.join(projectPath, '.vona/app.ts');
         const testInstance = await import(__rewriteRelativeImportExtension(pathToHref(testFile)));
-        return await testInstance.createSingleApp(envRuntime);
+        return await testInstance.createSingleApp();
     }
 }
 // export async function reloadApp() {

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

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

package/dist/lib/utils/index.js

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

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

@@ -4,6 +4,7 @@ import type { BinaryToTextEncoding, HashOptions } from 'node:crypto';
 import type { IInstanceRecord, TypeMonkeyName, VonaConfigEnv, VonaContext } from '../../types/index.ts';
 import type { IBeanScopeRecord, TypeBeanScopeRecordKeys } from '../bean/type.ts';
 import type { IBeanSceneRecord } from '../decorator/interface/beanOptions.ts';
+import type { ZodLocaleErrors } from './zod-enhance.ts';
 import { BeanSimple } from '../bean/beanSimple.ts';
 export interface IExecuteBeanCallbackParams {
     ctx: VonaContext;
@@ -45,6 +46,7 @@ export declare class AppUtil extends BeanSimple {
     getModuleConfigRaw<K extends TypeBeanScopeRecordKeys>(moduleName: K): IBeanScopeRecord[K] extends {
         config?: infer CONFIG;
     } ? CONFIG | undefined : undefined;
+    setLocaleErrors(localeErrors: ZodLocaleErrors, localeDefault?: string): void;
 }
 export declare function compose(chains: any, adapter?: any): (context: any, next?: any) => any;
 export declare function instanceDesp(instanceName: keyof IInstanceRecord | null | undefined): string;

package/dist/lib/utils/util.js

@@ -9,6 +9,7 @@ import fse from 'fs-extra';
 import * as uuid from 'uuid';
 import { cast } from "../../types/index.js";
 import { BeanSimple } from "../bean/beanSimple.js";
+import { zodSetLocaleErrors } from "./zod-enhance.js";
 const SymbolProdRootPath = Symbol('SymbolProdRootPath');
 export class AppUtil extends BeanSimple {
     [SymbolProdRootPath];
@@ -208,6 +209,9 @@ export class AppUtil extends BeanSimple {
     getModuleConfigRaw(moduleName) {
         return this.app.config.modules[moduleName];
     }
+    setLocaleErrors(localeErrors, localeDefault) {
+        return zodSetLocaleErrors(this.app, localeErrors, localeDefault);
+    }
 }
 export function compose(chains, adapter) {
     return _compose(chains, adapter);

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

@@ -0,0 +1,9 @@
+import type { ILocaleInfos } from 'vona';
+import type z from 'zod';
+import type { VonaApplication } from '../core/application.ts';
+export type ZodLocaleError = () => {
+    localeError: z.core.$ZodErrorMap;
+};
+export type ZodLocaleErrors = Record<keyof ILocaleInfos, ZodLocaleError>;
+export declare function zodEnhance(app: VonaApplication): void;
+export declare function zodSetLocaleErrors(app: VonaApplication, localeErrors: ZodLocaleErrors, localeDefault?: string): void;

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

@@ -0,0 +1,14 @@
+import { setLocaleAdapter, setLocaleErrors } from '@cabloy/zod-errors-custom';
+import { ZodMetadata } from '@cabloy/zod-openapi';
+import { setParseAdapter } from '@cabloy/zod-query';
+export function zodEnhance(app) {
+    setLocaleAdapter((text, ...args) => {
+        return app.meta.text(text, ...args);
+    });
+    setParseAdapter(ZodMetadata);
+}
+export function zodSetLocaleErrors(app, localeErrors, localeDefault) {
+    setLocaleErrors(() => {
+        return app.meta.locale.locale;
+    }, localeErrors, localeDefault);
+}

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

@@ -1 +1 @@
-export {};
+export declare function zodExtendOpenApi(): void;

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

@@ -1,3 +1,27 @@
-import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
+import { hashkey, isNil } from '@cabloy/utils';
+import { ZodMetadata } from '@cabloy/zod-openapi';
+import { extendZodWithOpenApi } from '@cabloy/zod-to-openapi';
 import { z } from 'zod';
-extendZodWithOpenApi(z);
+import { deepExtend } from "./util.js";
+export function zodExtendOpenApi() {
+    extendZodWithOpenApi(z);
+    const openapiOriginal = z.ZodType.prototype.openapi;
+    z.ZodType.prototype.openapi = function (...args) {
+        // refId
+        if (typeof args[0] === 'string')
+            return openapiOriginal.call(this, ...args);
+        const refId = ZodMetadata.getRefId(this);
+        if (!refId)
+            return openapiOriginal.call(this, ...args);
+        // metadata
+        const metadata = args[0];
+        if (isNil(metadata))
+            return openapiOriginal.call(this, ...args);
+        const options = args[1];
+        // refId: update
+        const refIdNew = `${refId}_${hashkey(metadata)}`;
+        const metadataOld = ZodMetadata.getOpenapiMetadata(this);
+        const metadataNew = deepExtend({}, metadataOld, metadata);
+        return openapiOriginal.call(this, refIdNew, metadataNew, options);
+    };
+}

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

@@ -15,6 +15,7 @@ export interface ContextBase {
     set ctxCaller(value: VonaContext);
     getController: () => Constructable | undefined;
     getControllerPrototype: () => object | undefined;
+    getControllerBean: <T = any>() => T | undefined;
     getControllerBeanFullName: () => string | undefined;
     getHandler: () => Function | undefined;
     getHandlerName: () => MetadataKey | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.47",
+  "version": "5.0.49",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -25,7 +25,6 @@
     "dist"
   ],
   "dependencies": {
-    "@asteasolutions/zod-to-openapi": "^7.3.0",
     "@cabloy/compose": "^2.0.14",
     "@cabloy/extend": "^3.1.10",
     "@cabloy/json5": "^1.0.18",
@@ -35,6 +34,10 @@
     "@cabloy/set": "^1.0.17",
     "@cabloy/utils": "^1.0.39",
     "@cabloy/word-utils": "^2.0.1",
+    "@cabloy/zod-errors-custom": "^2.0.1",
+    "@cabloy/zod-openapi": "^1.0.1",
+    "@cabloy/zod-query": "^2.0.1",
+    "@cabloy/zod-to-openapi": "^8.1.1",
     "chalk": "^5.3.0",
     "fs-extra": "^10.1.0",
     "koa": "^3.0.0",
@@ -44,7 +47,7 @@
     "uuid": "^11.0.3",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "zod": "^3.25.58"
+    "zod": "^4.1.5"
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {