vona-core 5.0.36 → 5.0.38

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

@@ -7,8 +7,8 @@ export declare class BeanBaseSimple extends BeanSimple {
     private [SymbolBeanFullName];
     protected get [SymbolModuleBelong](): string;
     protected get [SymbolModuleName](): string | undefined;
-    protected get $beanFullName(): string;
+    get $beanFullName(): string;
     protected get $beanOptions(): IDecoratorBeanOptionsBase;
-    protected get $onionName(): string;
+    get $onionName(): string;
     protected get $onionOptions(): unknown | undefined;
 }

package/dist/lib/bean/beanContainer.js

@@ -1,9 +1,8 @@
-import { isNilOrEmptyString } from '@cabloy/utils';
+import { isClass, isNilOrEmptyString } from '@cabloy/utils';
 import { cast } from "../../types/index.js";
 import { appMetadata } from "../core/metadata.js";
 import { appResource, SymbolDecoratorProxyDisable } from "../core/resource.js";
 import { __prepareInjectSelectorInfo } from "../decorator/index.js";
-import { isClass } from "../utils/isClass.js";
 import { compose } from "../utils/util.js";
 import { BeanAopBase } from "./beanAopBase.js";
 import { BeanBase } from "./beanBase.js";

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/bean/scope/beanScopeBase.js

@@ -70,14 +70,14 @@ export class BeanScopeBase extends BeanBaseSimple {
         // model
         if (prop === 'model') {
             if (!this[BeanModuleModel]) {
-                this[BeanModuleModel] = this.bean._newBean('a-database.service.modelResolver', moduleBelong);
+                this[BeanModuleModel] = this.bean._newBean('a-orm.service.modelResolver', moduleBelong);
             }
             return this[BeanModuleModel];
         }
         // entity
         if (prop === 'entity') {
             if (!this[BeanModuleEntity]) {
-                this[BeanModuleEntity] = this.bean._newBean('a-database.service.entityResolver', moduleBelong);
+                this[BeanModuleEntity] = this.bean._newBean('a-orm.service.entityResolver', moduleBelong);
             }
             return this[BeanModuleEntity];
         }

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

@@ -5,6 +5,7 @@ import { BeanSimple } from '../bean/beanSimple.ts';
 export declare const SymbolDecoratorBeanFullName: unique symbol;
 export declare const SymbolDecoratorBeanInfo: unique symbol;
 export declare const SymbolDecoratorProxyDisable: unique symbol;
+export declare const SymbolDecoratorVirtual: unique symbol;
 export declare const SymbolDecoratorUse: unique symbol;
 export type IAppResourceRecord = Record<string, IDecoratorBeanOptionsBase>;
 export declare class AppResource extends BeanSimple {

package/dist/lib/core/resource.js

@@ -1,14 +1,15 @@
+import { isClass } from '@cabloy/utils';
 import { toLowerCaseFirstChar } from '@cabloy/word-utils';
 import { cast } from "../../types/utils/cast.js";
 import { BeanSimple } from "../bean/beanSimple.js";
 import { useApp } from "../framework/useApp.js";
 import { registerMappedClassMetadataKey } from "../mappedClass/utils.js";
-import { isClass } from "../utils/isClass.js";
 import { deepExtend } from "../utils/util.js";
 import { appMetadata } from "./metadata.js";
 export const SymbolDecoratorBeanFullName = Symbol('SymbolDecoratorBeanFullName');
 export const SymbolDecoratorBeanInfo = Symbol('SymbolDecoratorBeanInfo');
 export const SymbolDecoratorProxyDisable = Symbol('SymbolDecoratorProxyDisable');
+export const SymbolDecoratorVirtual = Symbol('SymbolDecoratorVirtual');
 export const SymbolDecoratorUse = Symbol('SymbolDecoratorUse');
 export class AppResource extends BeanSimple {
     beans = {};
@@ -22,7 +23,9 @@ export class AppResource extends BeanSimple {
         return appMetadata.getMetadata(SymbolDecoratorUse, target);
     }
     addBean(beanOptions) {
-        let { module, scene, name, beanClass, virtual, options, optionsPrimitive } = beanOptions;
+        let { module, scene, name, beanClass, options, optionsPrimitive } = beanOptions;
+        // virtual
+        const virtual = appMetadata.getOwnMetadata(SymbolDecoratorVirtual, beanClass);
         // name
         name = this._parseBeanName(beanClass, scene, name);
         // module

package/dist/lib/decorator/class/createBeanDecorator.d.ts

@@ -1,3 +1,3 @@
 import type { IBeanSceneRecord } from '../interface/beanOptions.ts';
 import type { Constructable } from '../type/constructable.ts';
-export declare function createBeanDecorator<T>(scene: keyof IBeanSceneRecord, options?: T, optionsPrimitive?: boolean, virtual?: boolean, fn?: (target: Constructable) => void): ClassDecorator;
+export declare function createBeanDecorator<T>(scene: keyof IBeanSceneRecord, options?: T, optionsPrimitive?: boolean, fn?: (target: Constructable) => void): ClassDecorator;

package/dist/lib/decorator/class/createBeanDecorator.js

@@ -1,6 +1,6 @@
 import { appResource } from "../../core/resource.js";
 import { parseModuleName } from "./util.js";
-export function createBeanDecorator(scene, options, optionsPrimitive, virtual, fn) {
+export function createBeanDecorator(scene, options, optionsPrimitive, fn) {
     return function (target) {
         const beanClass = target;
         // module
@@ -15,7 +15,6 @@ export function createBeanDecorator(scene, options, optionsPrimitive, virtual, f
             beanClass,
             options,
             optionsPrimitive,
-            virtual,
         });
         // fn
         fn?.(beanClass);

package/dist/lib/decorator/class/index.d.ts

@@ -2,3 +2,4 @@ export * from './beanInfo.ts';
 export * from './createBeanDecorator.ts';
 export * from './proxyDisable.ts';
 export * from './use.ts';
+export * from './virtual.ts';

package/dist/lib/decorator/class/index.js

@@ -2,3 +2,4 @@ export * from "./beanInfo.js";
 export * from "./createBeanDecorator.js";
 export * from "./proxyDisable.js";
 export * from "./use.js";
+export * from "./virtual.js";

package/dist/lib/decorator/class/virtual.d.ts

@@ -0,0 +1 @@
+export declare function Virtual(): ClassDecorator;

package/dist/lib/decorator/class/virtual.js

@@ -0,0 +1,8 @@
+import { appMetadata } from "../../core/metadata.js";
+import { SymbolDecoratorVirtual } from "../../core/resource.js";
+export function Virtual() {
+    return function (target) {
+        // set metadata
+        appMetadata.defineMetadata(SymbolDecoratorVirtual, true, target);
+    };
+}

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

@@ -1,3 +1,4 @@
 export * from './mappedClass.ts';
+export * from './pickClassInner.ts';
 export * from './type.ts';
 export * from './utils.ts';

package/dist/lib/mappedClass/index.js

@@ -1,3 +1,4 @@
 export * from "./mappedClass.js";
+export * from "./pickClassInner.js";
 export * from "./type.js";
 export * from "./utils.js";

package/dist/lib/mappedClass/mappedClass.d.ts

@@ -2,7 +2,7 @@ import { MixinClass } from './mixinClass.ts';
 import { OmitClass } from './omitClass.ts';
 import { PartialClass } from './partialClass.ts';
 import { PickClass } from './pickClass.ts';
-export declare const ClassMapped: {
+export declare const $Class: {
     mixin: typeof MixinClass;
     omit: typeof OmitClass;
     partial: typeof PartialClass;

package/dist/lib/mappedClass/mappedClass.js

@@ -2,7 +2,7 @@ import { MixinClass } from "./mixinClass.js";
 import { OmitClass } from "./omitClass.js";
 import { PartialClass } from "./partialClass.js";
 import { PickClass } from "./pickClass.js";
-export const ClassMapped = {
+export const $Class = {
     mixin: MixinClass,
     omit: OmitClass,
     partial: PartialClass,

package/dist/lib/mappedClass/pickClass.d.ts

@@ -1,2 +1,3 @@
 import type { Constructable } from '../decorator/type/constructable.ts';
+export declare function PickClass<T>(classRef: Constructable<T>, keys?: undefined): Constructable<T>;
 export declare function PickClass<T, K extends keyof T>(classRef: Constructable<T>, keys: K[]): Constructable<Pick<T, (typeof keys)[number]>>;

package/dist/lib/mappedClass/pickClass.js

@@ -1,14 +1,6 @@
-import { copyMetadataOfClasses, copyPropertiesOfClasses } from "./utils.js";
+import { PickClassInner } from 'vona';
 export function PickClass(classRef, keys) {
     class TargetClass {
     }
-    copyMetadataOfClasses(TargetClass.prototype, [classRef.prototype], (rules, key) => {
-        if (keys.includes(key)) {
-            return rules[key];
-        }
-    });
-    copyPropertiesOfClasses(TargetClass, [classRef], key => {
-        return keys.includes(key);
-    });
-    return TargetClass;
+    return PickClassInner(TargetClass, classRef, keys);
 }

package/dist/lib/mappedClass/pickClassInner.d.ts

@@ -0,0 +1,3 @@
+import type { Constructable } from '../decorator/type/constructable.ts';
+export declare function PickClassInner<T>(classTarget: Constructable, classRef: Constructable<T>, keys?: undefined): Constructable<T>;
+export declare function PickClassInner<T, K extends keyof T>(classTarget: Constructable, classRef: Constructable<T>, keys: K[]): Constructable<Pick<T, (typeof keys)[number]>>;

package/dist/lib/mappedClass/pickClassInner.js

@@ -0,0 +1,12 @@
+import { copyMetadataOfClasses, copyPropertiesOfClasses } from "./utils.js";
+export function PickClassInner(classTarget, classRef, keys) {
+    copyMetadataOfClasses(classTarget.prototype, [classRef.prototype], (rules, key) => {
+        if (!keys || keys.includes(key)) {
+            return rules[key];
+        }
+    });
+    copyPropertiesOfClasses(classTarget, [classRef], key => {
+        return !keys || keys.includes(key);
+    });
+    return classTarget;
+}

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

@@ -3,6 +3,7 @@ import type { Constructable } from '../decorator/index.ts';
 import type { IMappedClassMetadataOptions, MappedClassMetadataKeys } from './type.ts';
 export declare function registerMappedClassMetadataKey(target: object, metadataKey: MetadataKey, options?: IMappedClassMetadataOptions): void;
 export declare function getMappedClassMetadataKeys(target: object): MappedClassMetadataKeys | undefined;
+export declare function setMappedClassMetadataKeys(target: object, metadataKeys?: MappedClassMetadataKeys): void;
 export declare function copyPropertiesOfClasses(target: Constructable, sources: Constructable[], filter?: Function): void;
 export declare function copyProperties(target: object, source: object, keysIgnore: MetadataKey[], filter?: Function): void;
 export declare function copyMetadataOfClasses(target: object, sources: object[], transform?: Function): void;

package/dist/lib/mappedClass/utils.js

@@ -9,6 +9,9 @@ export function registerMappedClassMetadataKey(target, metadataKey, options) {
 export function getMappedClassMetadataKeys(target) {
     return appMetadata.getMetadata(SymbolMappedClassMetadataKeys, target);
 }
+export function setMappedClassMetadataKeys(target, metadataKeys) {
+    return appMetadata.defineMetadata(SymbolMappedClassMetadataKeys, metadataKeys, target);
+}
 export function copyPropertiesOfClasses(target, sources, filter) {
     for (const source of sources) {
         copyProperties(target, source, ['constructor', 'prototype', 'length', 'name'], filter); // copy static
@@ -51,6 +54,7 @@ export function copyMetadataOfClasses(target, sources, transform) {
             Object.assign(metadataKeys, _metadataKeys);
         }
     }
+    setMappedClassMetadataKeys(target, metadataKeys);
     //
     for (const metadataKey of Object.getOwnPropertySymbols(metadataKeys)) {
         const metadataKeyOptions = metadataKeys[metadataKey];

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

@@ -0,0 +1,9 @@
+import type { ILocaleInfos } from '../bean/resource/locale/type.ts';
+export interface ICustomKeyRecord {
+    'x-vona-locale': keyof ILocaleInfos | undefined;
+    'x-vona-instance-name': string | undefined;
+    'x-vona-passport-code': string | undefined;
+    'x-vona-oauth-code': string | undefined;
+    'x-vona-openapi-schema': 'true' | 'false' | undefined;
+}
+export declare function $customKey<K extends keyof ICustomKeyRecord>(key: K): K;

package/dist/lib/utils/customKey.js

@@ -0,0 +1,3 @@
+export function $customKey(key) {
+    return key;
+}

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

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

package/dist/lib/utils/index.js

@@ -1,4 +1,4 @@
 import "./zod-openapi.js";
-export * from "./isClass.js";
+export * from "./customKey.js";
 export * from "./retry.js";
 export * from "./util.js";

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

@@ -1,7 +1,2 @@
-export interface JwtPayload {
-    exp: number;
-    token: string;
-}
 export interface ContextState {
-    jwt?: JwtPayload;
 }

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

@@ -1,3 +1,7 @@
+import type { Constructable } from '../../lib/decorator/type/constructable.ts';
 export interface Type<T = any> extends Function {
     new (...args: any[]): T;
 }
+export type TypeClassOfClassLike<ClassLike> = ClassLike extends ((() => Constructable<infer Result>) | Constructable<infer Result>) ? Result : ClassLike extends ((() => infer Result) | infer Result) ? Result : ClassLike extends () => Constructable<infer Result> ? Result : ClassLike extends () => infer Result ? Result : ClassLike extends Constructable<infer Result> ? Result : ClassLike extends infer Result ? Result : undefined;
+export type TypeRecordValues<TRecord> = TRecord[keyof TRecord];
+export type TypeConfirmArray<A> = A extends any[] ? A : A[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.36",
+  "version": "5.0.38",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -30,10 +30,10 @@
     "@cabloy/extend": "^3.1.10",
     "@cabloy/json5": "^1.0.18",
     "@cabloy/localeutil": "^2.0.10",
-    "@cabloy/module-info": "^1.3.24",
-    "@cabloy/module-info-pro": "^1.0.32",
+    "@cabloy/module-info": "^1.3.25",
+    "@cabloy/module-info-pro": "^1.0.33",
     "@cabloy/set": "^1.0.17",
-    "@cabloy/utils": "^1.0.36",
+    "@cabloy/utils": "^1.0.38",
     "@cabloy/word-utils": "^2.0.1",
     "fs-extra": "^10.1.0",
     "koa": "^3.0.0",

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

@@ -1,2 +0,0 @@
-export declare function isClass(fn: any): boolean;
-export declare function isClassStrict(fn: any): boolean;

package/dist/lib/utils/isClass.js

@@ -1,18 +0,0 @@
-export function isClass(fn) {
-    // just check if is function
-    return typeof fn === 'function';
-}
-export function isClassStrict(fn) {
-    return typeof fn === 'function' && /^class(?:\s|\{)/.test(fn.toString());
-}
-// function fnBody(fn) {
-//   return fn
-//     .toString()
-//     .replace(/^[^{]*{\s*/, '')
-//     .replace(/\s*}[^}]*$/, '');
-// }
-// export function isClassStrict(fn) {
-//   return (
-//     typeof fn === 'function' && (/^class(?:\s|{)/.test(fn.toString()) || /^.*classCallCheck\(/.test(fnBody(fn))) // babel.js
-//   );
-// }