vona-cli-set-api 1.0.362 → 1.0.366

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

@@ -297,6 +297,18 @@
     ],
     "description": "record.locale"
   },
+  "record.mailclient": {
+    "scope": "typescript,typescriptreact",
+    "prefix": "recordmailclient",
+    "body": [
+      "declare module 'vona-module-a-mail' {",
+      "  export interface IMailClientRecord {",
+      "    $0: never;",
+      "  }",
+      "}"
+    ],
+    "description": "record.mailclient"
+  },
   "findManyQueryTransform": {
     "scope": "typescript,typescriptreact",
     "prefix": "findmanyquerytransform",

package/cli/templates/create/project/basic/boilerplate/env/.env

@@ -70,4 +70,16 @@ DATABASE_CLIENT_MYSQL_DATABASE = mysql
 REDIS_DEFAULT_HOST = 127.0.0.1
 REDIS_DEFAULT_PORT = 6379
 REDIS_DEFAULT_PASSWORD = 
-REDIS_DEFAULT_DB = 0
+REDIS_DEFAULT_DB = 0
+
+# mail
+
+MAIL_DEFAULT_CLIENT = 'system'
+
+MAIL_SYSTEM_TRANSPORT_SERVICE =
+MAIL_SYSTEM_TRANSPORT_HOST =
+MAIL_SYSTEM_TRANSPORT_PORT =
+MAIL_SYSTEM_TRANSPORT_SECURE = false
+MAIL_SYSTEM_TRANSPORT_AUTH_USER =
+MAIL_SYSTEM_TRANSPORT_AUTH_PASS =
+MAIL_SYSTEM_DEFAULTS_FROM = no.reply@cabloy.com

package/cli/templates/create/project/basic/boilerplate/env/.env.dev

@@ -0,0 +1,3 @@
+# mail
+
+MAIL_SYSTEM_TRANSPORT_SERVICE = test

package/cli/templates/create/project/basic/boilerplate/env/.env.test

@@ -0,0 +1,3 @@
+# mail
+
+MAIL_SYSTEM_TRANSPORT_SERVICE = test

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

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.208"
+    "vona": "^5.0.210"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/backend/config/config/config.ts

@@ -1,4 +1,5 @@
 import type { ILoggerOptionsClientInfo, VonaAppInfo, VonaApplication, VonaConfigEnv, VonaConfigOptional } from 'vona';
+import type { IMailClientRecord } from 'vona-module-a-mail';
 import type { IDatabaseClientRecord } from 'vona-module-a-orm';
 import type * as Winston from 'winston';
 import { replaceTemplate } from '@cabloy/utils';
@@ -20,6 +21,12 @@ declare module 'vona-module-a-orm' {
 export default function (appInfo: VonaAppInfo, env: VonaConfigEnv) {
   const config = {} as VonaConfigOptional;
 
+  // modules
+  config.modules = {};
+
+  // onions
+  config.onions = {};
+
   // meta
   config.meta = {
     flavor: appInfo.configMeta.flavor,
@@ -87,7 +94,7 @@ export default function (appInfo: VonaAppInfo, env: VonaConfigEnv) {
           this.bean.logger.makeTransportFile(clientInfo, 'http', 'http'),
           this.bean.logger.makeTransportFile(clientInfo, 'combined'),
           this.bean.logger.makeTransportConsole(clientInfo),
-        ].filter(item => !!item);
+        ];
         return { transports };
       },
     },
@@ -153,11 +160,27 @@ export default function (appInfo: VonaAppInfo, env: VonaConfigEnv) {
     ...config.database.clients![env.DATABASE_DEFAULT_CLIENT as keyof IDatabaseClientRecord],
   };
 
-  // modules
-  config.modules = {};
-
-  // onions
-  config.onions = {};
+  // mail
+  config.modules['a-mail'] = {
+    defaultClient: env.MAIL_DEFAULT_CLIENT as keyof IMailClientRecord,
+    clients: {
+      system: {
+        transport: {
+          service: env.MAIL_SYSTEM_TRANSPORT_SERVICE || undefined,
+          host: env.MAIL_SYSTEM_TRANSPORT_HOST || undefined,
+          port: env.MAIL_SYSTEM_TRANSPORT_PORT ? Number.parseInt(env.MAIL_SYSTEM_TRANSPORT_PORT) : undefined,
+          secure: env.MAIL_SYSTEM_TRANSPORT_SECURE === 'true',
+          auth: {
+            user: env.MAIL_SYSTEM_TRANSPORT_AUTH_USER || undefined,
+            pass: env.MAIL_SYSTEM_TRANSPORT_AUTH_PASS || undefined,
+          },
+        },
+        defaults: {
+          from: env.MAIL_SYSTEM_DEFAULTS_FROM || undefined,
+        },
+      },
+    },
+  };
 
   return config;
 }

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

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-index",
   "type": "module",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "title": "home-index",
   "vonaModule": {
     "dependencies": {

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

@@ -7,7 +7,7 @@ export class MetaPrintTip extends BeanBase implements IMetaPrintTipExecute {
   async execute(): Promise<TypeMetaPrintTipResult> {
     return {
       title: 'home',
-      message: this.app.util.getAbsoluteUrl(),
+      message: this.bean.core.getAbsoluteUrl(),
     };
   }
 }

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-suite-a-home",
   "type": "module",
-  "version": "5.0.22",
+  "version": "5.0.23",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

package/dist/lib/bean/cli.bin.dev.js

@@ -36,6 +36,7 @@ export class CliBinDev extends BeanCliBase {
                 execArgs: [getImportEsm()],
                 // execArgs: ['--experimental-transform-types', getImportEsm(), '--trace-deprecation'],
                 // signal: 'SIGHUP',
+                ignore: ['test/**/*.test.ts', 'src/backend/play'],
             });
             nodemon.on('quit', () => {
                 resolve(undefined);

package/dist/lib/bean/cli.bin.play.d.ts

@@ -5,10 +5,12 @@ declare module '@cabloy/cli' {
         mode?: VonaMetaMode;
         flavor?: VonaMetaFlavor;
         retainRuntime?: boolean;
+        attach?: boolean;
     }
 }
 export declare class CliBinPlay extends BeanCliBase {
     execute(): Promise<void>;
     _play(projectPath: string): Promise<void>;
-    _run(projectPath: string): Promise<void>;
+    _runAttach(projectPath: string): Promise<void>;
+    _runIsolate(projectPath: string): Promise<void>;
 }

package/dist/lib/bean/cli.bin.play.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { BeanCliBase } from '@cabloy/cli';
 import fse from 'fs-extra';
-import { getImportEsm } from "../utils.js";
+import { getImportEsm, loadJSONFile } from "../utils.js";
 import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
 export class CliBinPlay extends BeanCliBase {
     async execute() {
@@ -25,9 +25,49 @@ export class CliBinPlay extends BeanCliBase {
             };
             await generateVonaMeta(configMeta, configOptions);
         }
-        await this._run(projectPath);
+        if (argv.attach) {
+            await this._runAttach(projectPath);
+        }
+        else {
+            await this._runIsolate(projectPath);
+        }
+    }
+    async _runAttach(projectPath) {
+        const runtimeFile = path.join(projectPath, '.app/runtime/-.json');
+        if (!fse.existsSync(runtimeFile))
+            throw new Error('dev server not running');
+        // args
+        let args = [];
+        const pos = process.argv.indexOf(':bin:play');
+        if (pos > -1) {
+            args = args.concat(process.argv.slice(pos + 1));
+        }
+        const body = { args, projectPath };
+        //
+        const runtime = await loadJSONFile(runtimeFile);
+        const runtimeCore = runtime['a-core'];
+        const runtimeUser = runtime['a-user'];
+        const result = await fetch(`${runtimeCore.protocol}://${runtimeCore.host}/api/play`, {
+            method: 'post',
+            headers: {
+                'content-type': 'application/json',
+                'authorization': `Bearer ${runtimeUser.accessToken}`,
+            },
+            body: JSON.stringify(body),
+        });
+        if (result.status !== 200) {
+            const message = `error: ${result.status}, ${result.statusText}`;
+            throw new Error(message);
+        }
+        const res = await result.json();
+        if (res.code !== 0)
+            throw new Error(res.message);
+        if (res.data !== undefined) {
+            // eslint-disable-next-line no-console
+            console.log(res.data);
+        }
     }
-    async _run(projectPath) {
+    async _runIsolate(projectPath) {
         // testFile
         let testFile = path.join(import.meta.dirname, './toolsBin/play.ts');
         if (!fse.existsSync(testFile)) {

package/dist/lib/bean/toolsBin/play.js

@@ -17,6 +17,7 @@ const __template = `import type { IArgv, VonaApplication } from 'vona';
 export async function main(app: VonaApplication, _argv: IArgv) {
   console.log(import.meta.filename);
   console.log(app.config.meta);
+  return 'Hello VonaJS';
 }
 `;
 const projectPath = process.argv[2];
@@ -40,7 +41,11 @@ async function playRun(projectPath) {
     }
     // run
     const playInstance = await import(__rewriteRelativeImportExtension(pathToHref(playFile)));
-    await playInstance.main(app, argv);
+    const res = await playInstance.main(app, argv);
+    if (res !== undefined) {
+        // eslint-disable-next-line no-console
+        console.log(res);
+    }
     // close
     await app.close();
     // handles

package/dist/lib/command/bin.play.d.ts

@@ -18,6 +18,11 @@ declare const _default: {
             description: string;
             type: string;
         };
+        attach: {
+            alias: string;
+            description: string;
+            type: string;
+        };
     };
 };
 export default _default;

package/dist/lib/command/bin.play.js

@@ -3,7 +3,7 @@ export default {
     info: {
         version: '5.0.0',
         title: 'Cli: Bin: Play',
-        usage: 'vona :bin:play [index.ts] [--flavor=] [--retainRuntime=]',
+        usage: 'vona :bin:play [index.ts] [--flavor=] [--retainRuntime=] [--attach]',
     },
     options: {
         mode: {
@@ -18,5 +18,10 @@ export default {
             description: 'retainRuntime',
             type: 'boolean',
         },
+        attach: {
+            alias: 'a',
+            description: 'attach',
+            type: 'boolean',
+        },
     },
 };

package/dist/lib/command/create.bean.d.ts

@@ -7,6 +7,7 @@ declare const _default: {
     };
     options: {
         module: {
+            alias: string;
             description: string;
             type: string;
         };

package/dist/lib/command/create.bean.js

@@ -7,6 +7,7 @@ export default {
     },
     options: {
         module: {
+            alias: 'm',
             description: 'module name',
             type: 'string',
         },

package/dist/lib/commands.d.ts

@@ -108,6 +108,11 @@ export declare const commands: {
                     description: string;
                     type: string;
                 };
+                attach: {
+                    alias: string;
+                    description: string;
+                    type: string;
+                };
             };
         };
         test: {
@@ -272,6 +277,7 @@ export declare const commands: {
             };
             options: {
                 module: {
+                    alias: string;
                     description: string;
                     type: string;
                 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.362",
+  "version": "1.0.366",
   "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.58",
+    "@cabloy/cli": "^3.0.59",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
     "@cabloy/module-glob": "^5.2.32",
@@ -61,9 +61,9 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.97",
+    "vona-core": "^5.0.98",
     "why-is-node-running": "^3.2.2",
-    "yargs-parser": "^21.1.1"
+    "yargs-parser": "^22.0.0"
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {