vona-core 5.0.109 → 5.0.111

package/dist/index.js

@@ -318,8 +318,9 @@ function prepareEnv(env) {
 function beanFullNameFromOnionName(onionName, sceneName) {
   return onionName.replace(':', `.${sceneName}.`);
 }
-function onionNameFromBeanFullName(beanFullName, sceneName) {
-  return beanFullName.replace(`.${sceneName}.`, ':');
+function onionNameFromBeanFullName(beanFullName) {
+  const parts = beanFullName.split('.');
+  return `${parts[0]}:${parts[2]}`;
 }
 function filterHeaders(headers, whitelist) {
   if (!headers) return;
@@ -695,8 +696,7 @@ class BeanBaseSimple extends BeanSimple {
     return appResource.getBean(this[SymbolBeanFullName]);
   }
   get $onionName() {
-    const parts = this.$beanFullName.split('.');
-    return `${parts[0]}:${parts[2]}`;
+    return onionNameFromBeanFullName(this.$beanFullName);
   }
   get $onionOptions() {
     return this.$beanOptions.options;
@@ -917,11 +917,12 @@ function __prepareInjectSelectorInfo_init(beanInstance, useOptions) {
   const withSelector = init.withSelector ?? false;
   const _args = init.args ?? [init.arg];
   if (!_args) return;
-  const args = _args.map(arg => evaluateExpressions(arg, {
-    self: beanInstance,
-    app: beanInstance.app,
-    ctx: beanInstance.ctx
-  }));
+  const context = {
+    self: {
+      ...beanInstance
+    }
+  };
+  const args = _args.map(arg => evaluateExpressions(arg, context));
   return {
     withSelector,
     args
@@ -3011,6 +3012,14 @@ function handleProcessMaster(workers) {
     // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
     if (cluster.workers && Object.keys(cluster.workers).length === 0) {
       clearTimeout(__timeout);
+      // log
+      const app = useApp();
+      if (app.meta.env.LOGGER_DUMMY !== 'true') {
+        const message = `Master shutdown gracefully: ${process.pid}`;
+        // eslint-disable-next-line
+        console.log(chalk.cyan(message));
+      }
+      // exit
       process.exit(0);
     }
   });

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

@@ -59,7 +59,7 @@ export declare function polyfillDispose(instance: any): void;
 export declare function pathToHref(fileName: string): string;
 export declare function prepareEnv(env: Partial<NodeJS.ProcessEnv>): VonaConfigEnv;
 export declare function beanFullNameFromOnionName(onionName: string, sceneName: keyof IBeanSceneRecord): keyof IBeanRecord;
-export declare function onionNameFromBeanFullName(beanFullName: string, sceneName: keyof IBeanSceneRecord): string;
+export declare function onionNameFromBeanFullName(beanFullName: string): string;
 export declare function filterHeaders(headers: object | undefined, whitelist: string[]): {} | undefined;
 export declare function combineFilePathSafe(dir: string, file: string): string;
 export declare function loadJSONFile(fileName: string): Promise<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.109",
+  "version": "5.0.111",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -33,7 +33,7 @@
     "@cabloy/module-info-pro": "^1.0.40",
     "@cabloy/set": "^1.0.18",
     "@cabloy/type-fest": "^5.3.1",
-    "@cabloy/utils": "^1.0.49",
+    "@cabloy/utils": "^2.0.1",
     "@cabloy/word-utils": "^2.0.1",
     "@cabloy/zod-errors-custom": "^2.0.4",
     "@cabloy/zod-openapi": "^1.0.8",