vona-cli-set-api 1.0.61 → 1.0.65

package/cli/templates/create/project/basic/boilerplate/_.npmrc

@@ -13,6 +13,7 @@ public-hoist-pattern[]=*cabloy*
 public-hoist-pattern[]=*@cabloy*
 public-hoist-pattern[]=*why-is-node-running*
 public-hoist-pattern[]=*ts-node*
+public-hoist-pattern[]=zod
 link-workspace-packages = 'deep'
 prefer-workspace-packages = true
 auto-install-peers = true

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

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

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

@@ -17,6 +17,7 @@ export interface IControllerOptionsPassport extends IDecoratorControllerOptions
 @Controller<IControllerOptionsPassport>('passport')
 export class ControllerPassport extends BeanBase {
   @Web.get('current')
+  @Passport.public()
   @Api.body(v.optional(), v.object(DtoPassport))
   current(): DtoPassport | undefined {
     return this._combineDtoPassport();
@@ -106,7 +107,7 @@ export class ControllerPassport extends BeanBase {
 
   private _combineDtoPassport(): DtoPassport | undefined {
     const passport = this.bean.passport.getCurrent();
-    if (!passport) return;
+    if (!passport || !passport.auth) return;
     return {
       user: passport.user as EntityUser,
       auth: { id: passport.auth!.id },

package/cli/templates/tools/crud/snippets/2-meta.index.ts

@@ -0,0 +1,47 @@
+import fs from 'node:fs';
+import { metadataCustomSnippet } from '@cabloy/cli';
+import { catchError } from '@cabloy/utils';
+
+declare module '@cabloy/cli' {
+  interface ICommandArgv {
+    module: string;
+  }
+}
+
+const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-database\';\n';
+const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';\n';
+const __snippet_update = `...$tableColumns(
+      () => Entity<%=argv.resourceNameCapitalize%>,
+      entity => entity.name,
+    ),`;
+
+export default metadataCustomSnippet({
+  file: 'src/bean/meta.index.ts',
+  language: 'plain',
+  init: async ({ cli, argv, targetFile }) => {
+    await catchError(() => {
+      return cli.helper.invokeCli([
+        ':create:bean',
+        'meta',
+        'index',
+        `--module=${argv.module}`,
+      ], { cwd: argv.projectPath });
+    });
+    return fs.readFileSync(targetFile).toString('utf8');
+  },
+  async transform({ cli, ast }) {
+    // import1
+    if (!ast.includes(__snippet_import1)) {
+      const code = await cli.template.renderContent({ content: __snippet_import1 });
+      ast = `${code}${ast}`;
+    }
+    // import2
+    let code = await cli.template.renderContent({ content: __snippet_import2 });
+    ast = `${code}${ast}`;
+    // update
+    code = await cli.template.renderContent({ content: __snippet_update });
+    ast = ast.replace('indexes: {', `indexes: {\n${code}`);
+    // ok
+    return ast;
+  },
+});

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

@@ -10,7 +10,7 @@ import terserImport from '@rollup/plugin-terser';
 import fse from 'fs-extra';
 import { rimraf } from 'rimraf';
 import { rollup } from 'rollup';
-import { generateConfigDefine, getOutDir, getOutReleasesDir } from "../utils.js";
+import { generateConfigDefine, getAbsolutePathOfModule, getOutDir, getOutReleasesDir } from "../utils.js";
 import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
 const commonjs = commonjsImport;
 const resolve = resolveImport;
@@ -89,6 +89,7 @@ export class CliBinBuild extends BeanCliBase {
             aliasEntries.push({ find: name, replacement: 'vona-shared' });
         }
         const replaceValues = generateConfigDefine(env, ['NODE_ENV', 'META_MODE', 'META_FLAVOR']);
+        const babelPluginZovaBeanModule = getAbsolutePathOfModule('babel-plugin-zova-bean-module', '');
         const plugins = [
             alias({
                 entries: aliasEntries,
@@ -110,7 +111,7 @@ export class CliBinBuild extends BeanCliBase {
                 babelrc: false,
                 configFile: false,
                 plugins: [
-                    ['babel-plugin-zova-bean-module', { brandName: 'vona' }],
+                    [babelPluginZovaBeanModule, { brandName: 'vona' }],
                     ['babel-plugin-transform-typescript-metadata'],
                     ['@babel/plugin-proposal-decorators', { version: 'legacy' }],
                     ['@babel/plugin-transform-class-properties', { loose: true }],

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

@@ -44,7 +44,7 @@ async function testRun(projectPath, coverage, patterns) {
     let coverageIncludeGlobs = [];
     if (coverage) {
         if (fse.existsSync(path.join(projectPath, 'packages-vona/vona-core'))) {
-            coverageIncludeGlobs = coverageIncludeGlobs.concat(['packages-vona/vona-core/**/*.ts', 'src/module-vendor/**/*.ts', 'src/suite-vendor/**/*.ts']);
+            coverageIncludeGlobs = coverageIncludeGlobs.concat(['packages-vona/vona-core/**/*.ts', 'src/suite-vendor/a-vona/**/*.ts']);
         }
         else {
             coverageIncludeGlobs = coverageIncludeGlobs.concat(['src/module/**/*.ts', 'src/suite/**/*.ts']);

package/dist/lib/utils.js

@@ -29,9 +29,11 @@ export function generateConfigDefine(env, translates) {
 export function getAbsolutePathOfModule(id, postfix = 'index.js') {
     const require = createRequire(import.meta.url);
     let modulePath = require.resolve(id);
-    const pos = modulePath.lastIndexOf(postfix);
-    if (pos > -1) {
-        modulePath = modulePath.substring(0, modulePath.length - postfix.length - 1);
+    if (postfix) {
+        const pos = modulePath.lastIndexOf(postfix);
+        if (pos > -1) {
+            modulePath = modulePath.substring(0, modulePath.length - postfix.length - 1);
+        }
     }
     return modulePath;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.61",
+  "version": "1.0.65",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -60,7 +60,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.20",
+    "vona-core": "^5.0.21",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },