vona-core 5.0.26 → 5.0.29

package/dist/lib/core/config.js

@@ -7,7 +7,7 @@ import { combineLoggerDefault } from "./loggerDefault.js";
 export function combineAppConfigDefault(appInfo, env) {
     let config = configDefault(appInfo, env);
     const mode = appInfo.configMeta.mode;
-    if (mode === 'local') {
+    if (mode === 'dev') {
         config = deepExtend(config, configLocal(env));
     }
     else if (mode === 'prod') {
@@ -83,7 +83,7 @@ export function configTest(_env) {
 function getLoggerPathPhysicalRoot(appInfo) {
     const mode = appInfo.configMeta.mode;
     let loggerDir;
-    if (mode === 'test' || mode === 'local') {
+    if (mode === 'test' || mode === 'dev') {
         loggerDir = path.join(appInfo.projectPath, '.app/logs');
     }
     else {
@@ -95,7 +95,7 @@ function getLoggerPathPhysicalRoot(appInfo) {
 function getPublicPathPhysicalRoot(appInfo) {
     const mode = appInfo.configMeta.mode;
     let publicDir;
-    if (mode === 'test' || mode === 'local') {
+    if (mode === 'test' || mode === 'dev') {
         publicDir = path.join(appInfo.projectPath, '.app/public');
     }
     else {
@@ -107,7 +107,7 @@ function getPublicPathPhysicalRoot(appInfo) {
 export async function combineConfigDefault(app, configDefault, configLocal, configProd, configTest) {
     let config = await configDefault(app);
     const mode = app.config.meta.mode;
-    if (mode === 'local' && configLocal) {
+    if (mode === 'dev' && configLocal) {
         config = deepExtend(config, await configLocal(app));
     }
     else if (mode === 'prod' && configProd) {

package/dist/lib/core/meta.js

@@ -65,7 +65,7 @@ export class AppMeta extends BeanSimple {
         const mode = this.app.config.meta.mode;
         this.isProd = mode === 'prod';
         this.isTest = mode === 'test';
-        this.isLocal = mode === 'local';
+        this.isLocal = mode === 'dev';
     }
     async waitAppStarted() {
         return new Promise((resolve, reject) => {

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

@@ -1,4 +1,4 @@
-import { evaluateExpressions } from '@cabloy/utils';
+import { evaluateExpressions, isNilOrEmptyString } from '@cabloy/utils';
 import { appMetadata } from "../../core/metadata.js";
 import { appResource } from "../../core/resource.js";
 export function Use(options) {
@@ -44,6 +44,10 @@ export function __prepareInjectSelectorInfo(beanInstance, useOptions) {
     if (!selectorInfo) {
         selectorInfo = __prepareInjectSelectorInfo_init(beanInstance, useOptions);
     }
+    if (!selectorInfo && !isNilOrEmptyString(useOptions.selector)) {
+        const selector = evaluateExpressions(useOptions.selector, beanInstance);
+        return { withSelector: true, args: [selector] };
+    }
     return selectorInfo ?? { withSelector: false, args: [] };
 }
 function __prepareInjectSelectorInfo_descriptor(beanInstance, useOptions) {
@@ -54,7 +58,7 @@ function __prepareInjectSelectorInfo_descriptor(beanInstance, useOptions) {
     if (!res)
         return;
     const withSelector = res.withSelector ?? false;
-    const args = res.args.map(arg => arg());
+    const args = res.args.map(arg => typeof arg === 'function' ? arg() : arg);
     return { withSelector, args };
 }
 function __prepareInjectSelectorInfo_init(beanInstance, useOptions) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.26",
+  "version": "5.0.29",
   "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.22",
-    "@cabloy/module-info-pro": "^1.0.30",
+    "@cabloy/module-info": "^1.3.23",
+    "@cabloy/module-info-pro": "^1.0.31",
     "@cabloy/set": "^1.0.17",
-    "@cabloy/utils": "^1.0.30",
+    "@cabloy/utils": "^1.0.31",
     "@cabloy/word-utils": "^2.0.1",
     "fs-extra": "^10.1.0",
     "koa": "^3.0.0",