vona-core 5.0.107 → 5.0.109

package/dist/index.js

@@ -1729,6 +1729,7 @@ class AppLocale extends BeanSimple {
   }
   getText(supportCustomMessage, moduleScope, locale, key, ...args) {
     if (!key) return key;
+    if (typeof key === 'object') key = String(key);
     if (typeof key !== 'string') throw new Error(`${key} should be string`);
     const pos = key.indexOf(LocaleModuleNameSeparator);
     if (pos > -1) {
@@ -1756,7 +1757,19 @@ class BeanScopeLocale extends BeanSimple {
 }
 
 function $localeScope(moduleName, key) {
-  return `${moduleName}::${String(key)}`;
+  return $makeLocaleMagic(`${moduleName}::${String(key)}`);
+}
+function $makeLocaleMagic(str) {
+  return {
+    toString() {
+      return str;
+    },
+    toJSON() {
+      if (!str || !str.includes(LocaleModuleNameSeparator)) return str;
+      const app = useApp();
+      return app.meta.text(str);
+    }
+  };
 }
 
 const BeanModuleScope$1 = Symbol('BeanScopeScene#ModuleScope');
@@ -2966,8 +2979,45 @@ function prepareAppInfo(env) {
   };
 }
 
-let __sigintHandled = false;
-async function _closeAppInner() {
+let __closing$1 = false;
+let __timeout;
+async function _closeInner$1() {
+  __timeout = setTimeout(() => {
+    // eslint-disable-next-line no-console
+    console.log('Cleanup timed out. Forcing termination...');
+    process.exit(1);
+  }, 5000);
+}
+function handleProcessMaster(workers) {
+  ['SIGINT', 'SIGUSR2'].forEach(signal => {
+    process.on(signal, async () => {
+      if (__closing$1) return;
+      __closing$1 = true;
+      await _closeInner$1();
+    });
+  });
+  for (let i = 0; i < workers; i++) {
+    cluster.fork();
+  }
+  cluster.on('message', (worker, message) => {
+    if (message === 'reload-worker') {
+      if (!__closing$1) {
+        cluster.fork();
+      }
+      worker.process.kill('SIGTERM');
+    }
+  });
+  cluster.on('exit', (_worker, _code, _signal) => {
+    // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
+    if (cluster.workers && Object.keys(cluster.workers).length === 0) {
+      clearTimeout(__timeout);
+      process.exit(0);
+    }
+  });
+}
+
+let __closing = false;
+async function _closeInner() {
   const timeout = setTimeout(() => {
     // eslint-disable-next-line no-console
     console.log('Cleanup timed out. Forcing termination...');
@@ -2983,15 +3033,12 @@ async function _closeAppInner() {
   process.exit(err ? 1 : 0);
 }
 function handleProcessWork() {
-  process.on('SIGINT', async () => {
-    if (__sigintHandled) return;
-    __sigintHandled = true;
-    // console.log('------------SIGINT');
-    await _closeAppInner();
-  });
-  process.on('SIGUSR2', async () => {
-    // console.log('------------SIGUSR2');
-    await _closeAppInner();
+  ['SIGINT', 'SIGUSR2'].forEach(signal => {
+    process.on(signal, async () => {
+      if (__closing) return;
+      __closing = true;
+      await _closeInner();
+    });
   });
   process.on('uncaughtException', async err => {
     const app = useApp();
@@ -3014,48 +3061,29 @@ function handleProcessWork() {
     }
   });
 }
-function handleProcessMaster() {
-  process.on('SIGINT', () => {
-    // donothing
-  });
-  process.on('SIGUSR2', () => {
-    // donothing
-  });
-}
 
 async function startCluster(workers, bootstrapOptions) {
   if (cluster.isPrimary) {
-    handleProcessMaster();
+    handleProcessMaster(workers);
     createAppMaster(bootstrapOptions);
-    for (let i = 0; i < workers; i++) {
-      cluster.fork();
-    }
-    cluster.on('message', (worker, message) => {
-      if (message === 'reload-worker') {
-        cluster.fork();
-        worker.process.kill('SIGTERM');
-      }
-    });
-    cluster.on('exit', (_worker, _code, _signal) => {
-      // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
-      if (cluster.workers && Object.keys(cluster.workers).length === 0) {
-        process.exit(0);
-      }
-    });
   } else {
-    handleProcessWork();
-    await createApp(bootstrapOptions);
+    await startWorker(bootstrapOptions);
   }
 }
+async function startWorker(bootstrapOptions) {
+  handleProcessWork();
+  return await createApp(bootstrapOptions);
+}
 
 async function bootstrap(bootstrapOptions) {
   const env = prepareEnv(bootstrapOptions.env);
   const workers = Number.parseInt(env.SERVER_WORKERS);
-  if (workers === 1 && process.env.META_MODE !== 'dev') {
-    handleProcessWork();
-    return await createApp(bootstrapOptions);
+  const alwaysCluster = process.env.META_MODE === 'dev' || process.platform.startsWith('win');
+  if (workers > 1 || alwaysCluster) {
+    await startCluster(workers, bootstrapOptions);
+  } else {
+    return await startWorker(bootstrapOptions);
   }
-  await startCluster(workers, bootstrapOptions);
 }
 
 function ExtendClass(classRef) {
@@ -3201,4 +3229,4 @@ function prepareNativeBinding(nativeBinding) {
 
 zodExtendOpenApi();
 
-export { $Class, $customKey, $localeScope, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, handleProcessMaster, handleProcessWork, instanceDesp, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, useApp, usePrepareArg, usePrepareArgs, uuidv4 };
+export { $Class, $customKey, $localeScope, $makeLocaleMagic, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, instanceDesp, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, useApp, usePrepareArg, usePrepareArgs, uuidv4 };

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

@@ -15,3 +15,7 @@ export interface ILocaleRecord {
     'en-us': never;
     'zh-cn': never;
 }
+export interface ILocaleMagic<T extends string = string> {
+    toString: () => T;
+    toJSON(): () => T;
+}

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

@@ -1,2 +1,4 @@
 import type { IBeanScopeLocale } from '../../type.ts';
-export declare function $localeScope<M extends keyof IBeanScopeLocale, K extends keyof IBeanScopeLocale[M]>(moduleName: M, key: K): `${M}::${K extends string ? K : never}`;
+import type { ILocaleMagic } from './type.ts';
+export declare function $localeScope<M extends keyof IBeanScopeLocale, K extends keyof IBeanScopeLocale[M]>(moduleName: M, key: K): ILocaleMagic<`${M}::${K extends string ? K : never}`>;
+export declare function $makeLocaleMagic<T extends string>(str: T): ILocaleMagic<T>;

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

@@ -2,3 +2,4 @@ export * from './constructable.ts';
 export * from './containerScope.ts';
 export * from './function.ts';
 export * from './injectionScope.ts';
+export * from './string.ts';

package/dist/lib/decorator/type/string.d.ts

@@ -0,0 +1 @@
+export type PickString<T> = T extends string ? T : never;

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

@@ -1,2 +1,3 @@
 import type { BootstrapOptions } from '../../types/interface/bootstrap.ts';
 export declare function startCluster(workers: number, bootstrapOptions: BootstrapOptions): Promise<void>;
+export declare function startWorker(bootstrapOptions: BootstrapOptions): Promise<any>;

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

@@ -1,4 +1,3 @@
 export * from './bootstrap.ts';
 export * from './createApp.ts';
-export * from './process.ts';
 export * from './useApp.ts';

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

@@ -0,0 +1 @@
+export declare function handleProcessMaster(workers: number): void;

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

@@ -0,0 +1 @@
+export declare function handleProcessWork(): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.107",
+  "version": "5.0.109",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -36,9 +36,9 @@
     "@cabloy/utils": "^1.0.49",
     "@cabloy/word-utils": "^2.0.1",
     "@cabloy/zod-errors-custom": "^2.0.4",
-    "@cabloy/zod-openapi": "^1.0.7",
+    "@cabloy/zod-openapi": "^1.0.8",
     "@cabloy/zod-query": "^2.0.4",
-    "@cabloy/zod-to-openapi": "^8.1.4",
+    "@cabloy/zod-to-openapi": "^8.1.5",
     "chalk": "^5.3.0",
     "fs-extra": "^10.1.0",
     "koa": "^3.0.0",

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

@@ -1,2 +0,0 @@
-export declare function handleProcessWork(): void;
-export declare function handleProcessMaster(): void;