vona-cli-set-api 1.0.240 → 1.0.244

package/cli/templates/create/project/basic/boilerplate/.vscode/vona.code-snippets

@@ -19,7 +19,7 @@
     "scope": "typescript,typescriptreact",
     "prefix": "aopinit",
     "body": [
-      "protected __init__: AopActionInit<BeanClassSome> = (_args, next, _receiver) => {",
+      "protected __init__: AopActionInit<ClassSome> = (_args, next, _receiver) => {",
       "  next();",
       "  $0",
       "}"
@@ -30,7 +30,7 @@
     "scope": "typescript,typescriptreact",
     "prefix": "aopdispose",
     "body": [
-      "protected __dispose__: AopActionDispose<BeanClassSome> = async (_args, next, _receiver) => {",
+      "protected __dispose__: AopActionDispose<ClassSome> = async (_args, next, _receiver) => {",
       "  $0",
       "  await next();",
       "}"
@@ -62,7 +62,7 @@
     "scope": "typescript,typescriptreact",
     "prefix": "aopgetter",
     "body": [
-      "protected __get_xxx__: AopActionGetter<BeanClassSome, 'xxx'> = function (next, _receiver) {",
+      "protected __get_xxx__: AopActionGetter<ClassSome, 'xxx'> = function (next, _receiver) {",
       "  const value = next();",
       "  return value;",
       "}"
@@ -73,7 +73,7 @@
     "scope": "typescript,typescriptreact",
     "prefix": "aopsetter",
     "body": [
-      "protected __set_xxx__: AopActionSetter<BeanClassSome, 'xxx'> = function (value, next, _receiver) {",
+      "protected __set_xxx__: AopActionSetter<ClassSome, 'xxx'> = function (value, next, _receiver) {",
       "  return next(value);",
       "}"
     ],
@@ -83,7 +83,7 @@
     "scope": "typescript,typescriptreact",
     "prefix": "aopaction",
     "body": [
-      "action: AopAction<BeanClassSome, 'action'> = async (_args, next, _receiver) => {",
+      "action: AopAction<ClassSome, 'action'> = async (_args, next, _receiver) => {",
       "  $0",
       "  return await next();",
       "}"
@@ -94,7 +94,7 @@
     "scope": "typescript,typescriptreact",
     "prefix": "aopactionsync",
     "body": [
-      "action: AopAction<BeanClassSome, 'action'> = (_args, next, _receiver) => {",
+      "action: AopAction<ClassSome, 'action'> = (_args, next, _receiver) => {",
       "  $0",
       "  return next();",
       "}"

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -45,7 +45,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.142"
+    "vona": "^5.0.144"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -22,6 +22,7 @@ declare module 'vona-module-home-base' {
           export interface ServiceMenu {
             get $beanFullName(): 'home-base.service.menu';
             get $onionName(): 'home-base:menu';
+            
           } 
 }
 /** service: end */
@@ -62,6 +63,7 @@ declare module 'vona-module-home-base' {
           export interface ControllerMenu {
             get $beanFullName(): 'home-base.controller.menu';
             get $onionName(): 'home-base:menu';
+            get $onionOptions(): IControllerOptionsMenu;
           } 
 }
 /** controller: end */

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/src/.metadata/index.ts

@@ -22,6 +22,7 @@ declare module 'vona-module-home-index' {
           export interface MetaPrintTip {
             get $beanFullName(): 'home-index.meta.printTip';
             get $onionName(): 'home-index:printTip';
+            
           } 
 }
 /** meta: end */
@@ -47,6 +48,7 @@ declare module 'vona-module-home-index' {
           export interface ControllerHome {
             get $beanFullName(): 'home-index.controller.home';
             get $onionName(): 'home-index:home';
+            get $onionOptions(): IControllerOptionsHome;
           } 
 }
 /** controller: end */

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/index.ts

@@ -91,6 +91,7 @@ declare module 'vona-module-home-user' {
           export interface ModelRole {
             get $beanFullName(): 'home-user.model.role';
             get $onionName(): 'home-user:role';
+            get $onionOptions(): IModelOptionsRole;
           }
 
         export interface ModelRoleUser {
@@ -101,6 +102,7 @@ declare module 'vona-module-home-user' {
           export interface ModelRoleUser {
             get $beanFullName(): 'home-user.model.roleUser';
             get $onionName(): 'home-user:roleUser';
+            get $onionOptions(): IModelOptionsRoleUser;
           }
 
         export interface ModelUser {
@@ -111,6 +113,7 @@ declare module 'vona-module-home-user' {
           export interface ModelUser {
             get $beanFullName(): 'home-user.model.user';
             get $onionName(): 'home-user:user';
+            get $onionOptions(): IModelOptionsUser;
           } 
 }
 /** model: end */
@@ -256,6 +259,7 @@ declare module 'vona-module-home-user' {
           export interface ServicePassportAdapter {
             get $beanFullName(): 'home-user.service.passportAdapter';
             get $onionName(): 'home-user:passportAdapter';
+            
           }
 
         export interface ServiceRoleAdapter {
@@ -266,6 +270,7 @@ declare module 'vona-module-home-user' {
           export interface ServiceRoleAdapter {
             get $beanFullName(): 'home-user.service.roleAdapter';
             get $onionName(): 'home-user:roleAdapter';
+            
           }
 
         export interface ServiceUserAdapter {
@@ -276,6 +281,7 @@ declare module 'vona-module-home-user' {
           export interface ServiceUserAdapter {
             get $beanFullName(): 'home-user.service.userAdapter';
             get $onionName(): 'home-user:userAdapter';
+            
           } 
 }
 /** service: end */
@@ -328,6 +334,7 @@ declare module 'vona-module-home-user' {
           export interface EventListenerActivate {
             get $beanFullName(): 'home-user.eventListener.activate';
             get $onionName(): 'home-user:activate';
+            get $onionOptions(): IDecoratorEventListenerOptions;
           }
 
         export interface EventListenerEmailConfirmCallback {
@@ -338,6 +345,7 @@ declare module 'vona-module-home-user' {
           export interface EventListenerEmailConfirmCallback {
             get $beanFullName(): 'home-user.eventListener.emailConfirmCallback';
             get $onionName(): 'home-user:emailConfirmCallback';
+            get $onionOptions(): IDecoratorEventListenerOptions;
           }
 
         export interface EventListenerPasswordResetCallback {
@@ -348,6 +356,7 @@ declare module 'vona-module-home-user' {
           export interface EventListenerPasswordResetCallback {
             get $beanFullName(): 'home-user.eventListener.passwordResetCallback';
             get $onionName(): 'home-user:passwordResetCallback';
+            get $onionOptions(): IDecoratorEventListenerOptions;
           }
 
         export interface EventListenerRegister {
@@ -358,6 +367,7 @@ declare module 'vona-module-home-user' {
           export interface EventListenerRegister {
             get $beanFullName(): 'home-user.eventListener.register';
             get $onionName(): 'home-user:register';
+            get $onionOptions(): IDecoratorEventListenerOptions;
           } 
 }
 /** eventListener: end */
@@ -385,6 +395,7 @@ declare module 'vona-module-home-user' {
           export interface MetaIndex {
             get $beanFullName(): 'home-user.meta.index';
             get $onionName(): 'home-user:index';
+            get $onionOptions(): IMetaOptionsIndex;
           }
 
         export interface MetaVersion {
@@ -395,6 +406,7 @@ declare module 'vona-module-home-user' {
           export interface MetaVersion {
             get $beanFullName(): 'home-user.meta.version';
             get $onionName(): 'home-user:version';
+            
           } 
 }
 /** meta: end */
@@ -469,6 +481,7 @@ declare module 'vona-module-home-user' {
           export interface ControllerPassport {
             get $beanFullName(): 'home-user.controller.passport';
             get $onionName(): 'home-user:passport';
+            get $onionOptions(): IControllerOptionsPassport;
           } 
 }
 /** controller: end */
@@ -527,6 +540,7 @@ declare module 'vona-module-home-user' {
           export interface ZodRefineEmailUnique {
             get $beanFullName(): 'home-user.zodRefine.emailUnique';
             get $onionName(): 'home-user:emailUnique';
+            get $onionOptions(): IZodRefineOptionsEmailUnique;
           }
 
         export interface ZodRefinePasswordConfirm {
@@ -537,6 +551,7 @@ declare module 'vona-module-home-user' {
           export interface ZodRefinePasswordConfirm {
             get $beanFullName(): 'home-user.zodRefine.passwordConfirm';
             get $onionName(): 'home-user:passwordConfirm';
+            get $onionOptions(): IZodRefineOptionsPasswordConfirm;
           }
 
         export interface ZodRefineUsernameUnique {
@@ -547,6 +562,7 @@ declare module 'vona-module-home-user' {
           export interface ZodRefineUsernameUnique {
             get $beanFullName(): 'home-user.zodRefine.usernameUnique';
             get $onionName(): 'home-user:usernameUnique';
+            get $onionOptions(): IZodRefineOptionsUsernameUnique;
           } 
 }
 /** zodRefine: end */

package/dist/lib/bean/toolsMetadata/generateOnions.js

@@ -21,6 +21,47 @@ export async function generateOnions(sceneName, sceneMeta, moduleName, modulePat
         contentExports.push(`export * from '${fileNameJSRelative}';`);
         if (isIgnore)
             continue; // get scope() also can be ignored
+        // options
+        let onionOptions;
+        if (!sceneMeta.optionsNone) {
+            // fileInfo
+            const fileInfo = extractBeanInfo(sceneName, fileContent, sceneMeta);
+            // import options
+            if (fileInfo.optionsCustomInterface) {
+                contentImports.push(`import type { ${fileInfo.optionsCustomInterface} } from '${fileInfo.optionsCustomInterfaceFrom || fileNameJSRelative}';`);
+            }
+            // valueOptionsCustomInterface
+            let valueOptionsCustomInterface = fileInfo.optionsCustomInterface;
+            if (valueOptionsCustomInterface && sceneMeta.optionsCustomInterfaceTemplate) {
+                valueOptionsCustomInterface = replaceTemplate(sceneMeta.optionsCustomInterfaceTemplate, { optionsCustomInterface: valueOptionsCustomInterface });
+            }
+            // record
+            if (fileInfo.isGlobal) {
+                if (valueOptionsCustomInterface) {
+                    onionOptions = valueOptionsCustomInterface;
+                    contentRecordsGlobal.push(`'${beanNameFull}': ${valueOptionsCustomInterface};`);
+                }
+                else {
+                    if (sceneMeta.optionsGlobalInterfaceName) {
+                        onionOptions = sceneMeta.optionsGlobalInterfaceName;
+                        contentRecordsGlobal.push(`'${beanNameFull}': ${sceneMeta.optionsGlobalInterfaceName};`);
+                        needImportOptionsGlobalInterface = true;
+                    }
+                    else {
+                        contentRecordsGlobal.push(`'${beanNameFull}': never;`);
+                    }
+                }
+            }
+            else {
+                if (valueOptionsCustomInterface) {
+                    onionOptions = valueOptionsCustomInterface;
+                    contentRecordsLocal.push(`'${beanNameFull}': ${valueOptionsCustomInterface};`);
+                }
+                else {
+                    contentRecordsLocal.push(`'${beanNameFull}': never;`);
+                }
+            }
+        }
         // get scope() also can be ignored
         if (!['entity', 'dto'].includes(sceneName) && !isVirtual) {
             contentScopes.push(`
@@ -29,49 +70,15 @@ export async function generateOnions(sceneName, sceneMeta, moduleName, modulePat
           get scope(): ${scopeModuleName};
         }`);
             if (!isBeanGlobal) {
+                const contentOnionOptions = onionOptions ? `get $onionOptions(): ${onionOptions};` : '';
                 contentScopes.push(`
           export interface ${className} {
             get $beanFullName(): '${beanFullNameFromOnionName(beanNameFull, sceneName)}';
             get $onionName(): '${beanNameFull}';
+            ${contentOnionOptions}
           }`);
             }
         }
-        if (sceneMeta.optionsNone)
-            continue;
-        // fileInfo
-        const fileInfo = extractBeanInfo(sceneName, fileContent, sceneMeta);
-        // import options
-        if (fileInfo.optionsCustomInterface) {
-            contentImports.push(`import type { ${fileInfo.optionsCustomInterface} } from '${fileInfo.optionsCustomInterfaceFrom || fileNameJSRelative}';`);
-        }
-        // valueOptionsCustomInterface
-        let valueOptionsCustomInterface = fileInfo.optionsCustomInterface;
-        if (valueOptionsCustomInterface && sceneMeta.optionsCustomInterfaceTemplate) {
-            valueOptionsCustomInterface = replaceTemplate(sceneMeta.optionsCustomInterfaceTemplate, { optionsCustomInterface: valueOptionsCustomInterface });
-        }
-        // record
-        if (fileInfo.isGlobal) {
-            if (valueOptionsCustomInterface) {
-                contentRecordsGlobal.push(`'${beanNameFull}': ${valueOptionsCustomInterface};`);
-            }
-            else {
-                if (sceneMeta.optionsGlobalInterfaceName) {
-                    contentRecordsGlobal.push(`'${beanNameFull}': ${sceneMeta.optionsGlobalInterfaceName};`);
-                    needImportOptionsGlobalInterface = true;
-                }
-                else {
-                    contentRecordsGlobal.push(`'${beanNameFull}': never;`);
-                }
-            }
-        }
-        else {
-            if (valueOptionsCustomInterface) {
-                contentRecordsLocal.push(`'${beanNameFull}': ${valueOptionsCustomInterface};`);
-            }
-            else {
-                contentRecordsLocal.push(`'${beanNameFull}': never;`);
-            }
-        }
     }
     // middlewareGlobal
     const exportRecordsMiddlewareGlobal = `

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.240",
+  "version": "1.0.244",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-transform-class-properties": "^7.25.9",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@cabloy/cli": "^3.0.46",
+    "@cabloy/cli": "^3.0.47",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
     "@cabloy/module-glob": "^5.2.26",
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.64",
+    "vona-core": "^5.0.65",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },