vona-cli-set-api 1.1.92 → 1.1.95

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

@@ -36,10 +36,11 @@
     "format": "oxfmt --check",
     "format:fix": "oxfmt --write",
     "lint": "oxlint",
-    "lint:fix": "oxlint --fix"
+    "lint:fix": "oxlint --fix",
+    "update": "pnpm update && vona :tools:deps"
   },
   "dependencies": {
-    "vona": "^5.1.33"
+    "vona": "^5.1.34"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.1.7",

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-home-user",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -511,8 +511,8 @@ export interface IApiPathPostRecord{
         '/home/user/passport/logout': undefined;
 '/home/user/passport/register': undefined;
 '/home/user/passport/login': undefined;
-'/home/user/passport/refreshAuthToken': undefined;
 '/home/user/passport/createPassportJwtFromOauthCode': undefined;
+'/home/user/passport/refreshAuthToken': undefined;
 '/home/user/passport/createTempAuthToken': undefined;
     }
 

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -55,16 +55,16 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
       }
       // user: admin
       if (!this.scope.config.disableUserAdmin) {
-        await this.bean.authSimple.authenticate(
-          {
+        await this.bean.auth.authenticate('auth-simple:simple', {
+          clientOptions: {
             username: 'admin',
             password: options.password || this.scope.config.passwordDefault.admin,
             avatar: ':emoji:flower',
             confirmed: true,
           },
-          'register',
-          'default',
-        );
+          state: { intention: 'register' },
+          clientName: 'default',
+        });
       }
     }
   }

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

@@ -39,7 +39,7 @@ export class ControllerPassport extends BeanBase {
   @Core.captchaVerify({ scene: 'captcha-simple:simple' })
   @Api.body(v.object(DtoPassportJwt))
   async register(@Arg.body() data: DtoRegister) {
-    const jwt = await this.bean.authSimple.authenticate(data, 'register', 'default');
+    const jwt = await this.bean.auth.authenticate('auth-simple:simple', { clientOptions: data, state: { intention: 'register' }, clientName: 'default' });
     return this._combineDtoPassportJwt(jwt);
   }
 
@@ -48,7 +48,7 @@ export class ControllerPassport extends BeanBase {
   @Core.captchaVerify({ scene: 'captcha-simple:simple' })
   @Api.body(v.object(DtoPassportJwt))
   async login(@Arg.body() data: DtoLogin): Promise<DtoPassportJwt> {
-    const jwt = await this.bean.authSimple.authenticate(data, 'login', 'default');
+    const jwt = await this.bean.auth.authenticate('auth-simple:simple', { clientOptions: data, state: { intention: 'login' }, clientName: 'default' });
     return this._combineDtoPassportJwt(jwt);
   }
 
@@ -103,13 +103,6 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
-  @Web.post('refreshAuthToken')
-  @Passport.public()
-  @Api.body(v.object(DtoJwtToken))
-  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
-    return await this.bean.passport.refreshAuthToken(refreshToken);
-  }
-
   @Web.post('createPassportJwtFromOauthCode')
   @Passport.public()
   @Api.body(v.object(DtoPassportJwt))
@@ -118,6 +111,13 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
+  @Web.post('refreshAuthToken')
+  @Passport.public()
+  @Api.body(v.object(DtoJwtToken))
+  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
+    return await this.bean.passport.refreshAuthToken(refreshToken);
+  }
+
   @Web.post('createTempAuthToken')
   @Api.body(z.string())
   async createTempAuthToken(@Arg.query('path', v.optional()) path?: string): Promise<string> {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-home",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "zhennann",

package/cli/templates/create/project/cabloy-start/boilerplate/package.original.json

@@ -36,10 +36,11 @@
     "format": "oxfmt --check",
     "format:fix": "oxfmt --write",
     "lint": "oxlint",
-    "lint:fix": "oxlint --fix"
+    "lint:fix": "oxlint --fix",
+    "update": "pnpm update && vona :tools:deps"
   },
   "dependencies": {
-    "vona": "^5.1.33"
+    "vona": "^5.1.34"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.1.7",

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-home-user",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -511,8 +511,8 @@ export interface IApiPathPostRecord{
         '/home/user/passport/logout': undefined;
 '/home/user/passport/register': undefined;
 '/home/user/passport/login': undefined;
-'/home/user/passport/refreshAuthToken': undefined;
 '/home/user/passport/createPassportJwtFromOauthCode': undefined;
+'/home/user/passport/refreshAuthToken': undefined;
 '/home/user/passport/createTempAuthToken': undefined;
     }
 

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -55,16 +55,16 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
       }
       // user: admin
       if (!this.scope.config.disableUserAdmin) {
-        await this.bean.authSimple.authenticate(
-          {
+        await this.bean.auth.authenticate('auth-simple:simple', {
+          clientOptions: {
             username: 'admin',
             password: options.password || this.scope.config.passwordDefault.admin,
             avatar: ':emoji:flower',
             confirmed: true,
           },
-          'register',
-          'default',
-        );
+          state: { intention: 'register' },
+          clientName: 'default',
+        });
       }
     }
   }

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

@@ -39,7 +39,7 @@ export class ControllerPassport extends BeanBase {
   @Core.captchaVerify({ scene: 'captcha-simple:simple' })
   @Api.body(v.object(DtoPassportJwt))
   async register(@Arg.body() data: DtoRegister) {
-    const jwt = await this.bean.authSimple.authenticate(data, 'register', 'default');
+    const jwt = await this.bean.auth.authenticate('auth-simple:simple', { clientOptions: data, state: { intention: 'register' }, clientName: 'default' });
     return this._combineDtoPassportJwt(jwt);
   }
 
@@ -48,7 +48,7 @@ export class ControllerPassport extends BeanBase {
   @Core.captchaVerify({ scene: 'captcha-simple:simple' })
   @Api.body(v.object(DtoPassportJwt))
   async login(@Arg.body() data: DtoLogin): Promise<DtoPassportJwt> {
-    const jwt = await this.bean.authSimple.authenticate(data, 'login', 'default');
+    const jwt = await this.bean.auth.authenticate('auth-simple:simple', { clientOptions: data, state: { intention: 'login' }, clientName: 'default' });
     return this._combineDtoPassportJwt(jwt);
   }
 
@@ -103,13 +103,6 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
-  @Web.post('refreshAuthToken')
-  @Passport.public()
-  @Api.body(v.object(DtoJwtToken))
-  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
-    return await this.bean.passport.refreshAuthToken(refreshToken);
-  }
-
   @Web.post('createPassportJwtFromOauthCode')
   @Passport.public()
   @Api.body(v.object(DtoPassportJwt))
@@ -118,6 +111,13 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
+  @Web.post('refreshAuthToken')
+  @Passport.public()
+  @Api.body(v.object(DtoJwtToken))
+  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
+    return await this.bean.passport.refreshAuthToken(refreshToken);
+  }
+
   @Web.post('createTempAuthToken')
   @Api.body(z.string())
   async createTempAuthToken(@Arg.query('path', v.optional()) path?: string): Promise<string> {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-home",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "zhennann",

package/dist/index.js

@@ -2657,8 +2657,6 @@ class CliToolsMetadata extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat: src/index.ts need format
-    // argv.noformat = true;
     // moduleNames
     let moduleNames = argv._;
     const force = argv.force ?? moduleNames.length > 0;
@@ -2684,7 +2682,7 @@ class CliToolsMetadata extends BeanCliBase {
     const modulePath = module.root;
     const metaDir = path.join(modulePath, 'src/.metadata');
     const metaIndexFile = path.join(metaDir, 'index.ts');
-    if (fse.existsSync(metaIndexFile) && !force) {
+    if ((await fse.pathExists(metaIndexFile)) && !force) {
       // do nothing
       return;
     }
@@ -2785,13 +2783,14 @@ class CliToolsMetadata extends BeanCliBase {
     content = this._generatePatch_resources(content, 'vona', ['PowerPartial'], true);
     return content;
   }
-  _generatePatch_resources(content, packageName, resources, type) {
+  _generatePatch_resources(content, packageName, resources, isTypeImport) {
     const items = resources.filter(item => {
-      const regexp = new RegExp(`${item}[\\[\\]<,;?:\\s]`);
+      const escaped = item.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      const regexp = new RegExp(`${escaped}[\\[\\]<,;?:\\s]`);
       return !!regexp.exec(content);
     });
     if (items.length === 0) return content;
-    const importContent = `import ${type ? 'type ' : ''}{ ${items.join(',')} } from '${packageName}';`;
+    const importContent = `import ${isTypeImport ? 'type ' : ''}{ ${items.join(',')} } from '${packageName}';`;
     return `${importContent}\n${content}`;
   }
   async _generateLocales(modulePath, contentLocales) {
@@ -2806,7 +2805,7 @@ class CliToolsMetadata extends BeanCliBase {
   }
   async _generateThis(moduleName, relativeNameCapitalize, modulePath) {
     const thisDest = path.join(modulePath, 'src/.metadata/this.ts');
-    if (fse.existsSync(thisDest)) return;
+    if (await fse.pathExists(thisDest)) return;
     const content = `export const __ThisModule__ = '${moduleName}';
 export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts';
 `;
@@ -2816,33 +2815,23 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
   async _generateIndex(modulePath) {
     let jsContent = '';
     const jsFile = path.join(modulePath, 'src/index.ts');
-    if (fse.existsSync(jsFile)) {
+    if (await fse.pathExists(jsFile)) {
       jsContent = (await fse.readFile(jsFile)).toString();
     }
-    // jsTypes
-    const jsTypes = "export * from './types/index.ts';";
-    const jsTypesFile = path.join(modulePath, 'src/types/index.ts');
-    if (fse.existsSync(jsTypesFile) && !jsContent.includes(jsTypes)) {
-      jsContent = `${jsTypes}\n${jsContent}`;
-    }
-    // jsLib
-    const jsLib = "export * from './lib/index.ts';";
-    const jsLibFile = path.join(modulePath, 'src/lib/index.ts');
-    if (fse.existsSync(jsLibFile) && !jsContent.includes(jsLib)) {
-      jsContent = `${jsLib}\n${jsContent}`;
-    }
-    // jsLocales
-    const jsLocales = "export * from './.metadata/locales.ts';";
-    const jsLocalesFile = path.join(modulePath, 'src/.metadata/locales.ts');
-    if (fse.existsSync(jsLocalesFile) && !jsContent.includes(jsLocales)) {
-      jsContent = `${jsLocales}\n${jsContent}`;
-    }
-    // jsMetadata
-    const jsMetadata = "export * from './.metadata/index.ts';";
-    const jsMetadataFile = path.join(modulePath, 'src/.metadata/index.ts');
-    if (fse.existsSync(jsMetadataFile) && !jsContent.includes(jsMetadata)) {
-      jsContent = `${jsMetadata}\n${jsContent}`;
-    }
+    // exports
+    jsContent = await this._prependExportIfNeeded(jsContent, [{
+      exportLine: "export * from './types/index.ts';",
+      sourceFile: path.join(modulePath, 'src/types/index.ts')
+    }, {
+      exportLine: "export * from './lib/index.ts';",
+      sourceFile: path.join(modulePath, 'src/lib/index.ts')
+    }, {
+      exportLine: "export * from './.metadata/locales.ts';",
+      sourceFile: path.join(modulePath, 'src/.metadata/locales.ts')
+    }, {
+      exportLine: "export * from './.metadata/index.ts';",
+      sourceFile: path.join(modulePath, 'src/.metadata/index.ts')
+    }]);
     // trim empty
     jsContent = jsContent.replace('export {};\n', '');
     // write
@@ -2852,6 +2841,17 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
       logPrefix: 'format: '
     });
   }
+  async _prependExportIfNeeded(jsContent, entries) {
+    for (const {
+      exportLine,
+      sourceFile
+    } of entries) {
+      if ((await fse.pathExists(sourceFile)) && !jsContent.includes(exportLine)) {
+        jsContent = `${exportLine}\n${jsContent}`;
+      }
+    }
+    return jsContent;
+  }
   async _generatePackage(modulePath) {
     let pkgFile;
     let pkg;
@@ -2866,8 +2866,9 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
     // cli
     for (const name of ['cli', 'zovaRest']) {
       const pathCheck = path.join(modulePath, name);
-      if (!fse.existsSync(pathCheck)) continue;
+      if (!(await fse.pathExists(pathCheck))) continue;
       pkg = await _loadPkg();
+      pkg.files ??= [];
       const index = pkg.files.indexOf(name);
       if (index === -1) {
         changed = true;

package/dist/lib/bean/cli.tools.metadata.d.ts

@@ -8,9 +8,13 @@ export declare class CliToolsMetadata extends BeanCliBase {
     execute(): Promise<void>;
     _generateMetadata(moduleName: string, force: boolean): Promise<void>;
     _generatePatch(content: string): string;
-    _generatePatch_resources(content: string, packageName: string, resources: string[], type: boolean): string;
+    _generatePatch_resources(content: string, packageName: string, resources: string[], isTypeImport: boolean): string;
     _generateLocales(modulePath: any, contentLocales: any): Promise<void>;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
     _generateIndex(modulePath: string): Promise<void>;
+    _prependExportIfNeeded(jsContent: string, entries: {
+        exportLine: string;
+        sourceFile: string;
+    }[]): Promise<string>;
     _generatePackage(modulePath: string): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.92",
+  "version": "1.1.95",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [
@@ -63,12 +63,12 @@
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0",
     "@cabloy/cli": "^3.1.13",
-    "@cabloy/dotenv": "^1.2.5",
-    "@cabloy/module-glob": "^5.3.10",
     "@cabloy/utils": "^2.1.19",
-    "@cabloy/extend": "^3.2.5",
+    "@cabloy/dotenv": "^1.2.5",
     "babel-plugin-vona-bean-module": "^1.1.6",
-    "vona-core": "^5.1.16"
+    "@cabloy/module-glob": "^5.3.10",
+    "vona-core": "^5.1.17",
+    "@cabloy/extend": "^3.2.5"
   },
   "scripts": {
     "clean": "rimraf dist dist-cli dist-toolsIsolate tsconfig.build.tsbuildinfo tsconfig.cli.tsbuildinfo tsconfig.isolate.tsbuildinfo",