vona-cli-set-api 1.1.101 → 1.1.103

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

@@ -18,7 +18,7 @@ export default metadataCustomSnippet({
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
       return cli.helper.invokeCli(
-        [':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata', '--noformat'],
+        [':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata'],
         {
           cwd: argv.projectPath,
         },

package/cli/templates/tools/crudBasic/snippets/2-meta.version.ts

@@ -32,7 +32,6 @@ export default metadataCustomSnippet({
           'version',
           `--module=${argv.module}`,
           '--nometadata',
-          '--noformat',
         ],
         {
           cwd: argv.projectPath,

package/cli/templates/tools/crudBasic/snippets/3-en-us.ts

@@ -18,7 +18,7 @@ export default metadataCustomSnippet({
   language: 'plain',
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
-      return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata', '--noformat'], {
+      return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata'], {
         cwd: argv.projectPath,
       });
     });

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

@@ -18,7 +18,7 @@ export default metadataCustomSnippet({
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
       return cli.helper.invokeCli(
-        [':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata', '--noformat'],
+        [':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata'],
         {
           cwd: argv.projectPath,
         },

package/cli/templates/tools/crudStart/snippets/2-meta.version.ts

@@ -32,7 +32,6 @@ export default metadataCustomSnippet({
           'version',
           `--module=${argv.module}`,
           '--nometadata',
-          '--noformat',
         ],
         {
           cwd: argv.projectPath,

package/cli/templates/tools/crudStart/snippets/3-en-us.ts

@@ -18,7 +18,7 @@ export default metadataCustomSnippet({
   language: 'plain',
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
-      return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata', '--noformat'], {
+      return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata'], {
         cwd: argv.projectPath,
       });
     });

package/dist/index.js

@@ -916,7 +916,16 @@ class CliBinTest extends BeanCliBase {
       argv
     } = this.context;
     // globs
-    const patterns = this._combineTestPatterns(projectPath, modulesMeta);
+    let patterns;
+    if (argv._.length > 0) {
+      patterns = argv._.map(item => {
+        if (item.startsWith('src/')) return item;
+        if (item.startsWith('vona/src/')) return item.substring('vona/'.length);
+        return `src/**/test/**/${item}`;
+      });
+    } else {
+      patterns = this._combineTestPatterns(projectPath, modulesMeta);
+    }
     // testFile
     let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/test.ts');
     if (!fse.existsSync(testFile)) {
@@ -1039,13 +1048,14 @@ class CliCreateBean extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // ssrSiteModuleName
     argv.ssrSiteModuleName = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'vona-module-start-siteadmin' : 'vona-module-basic-siteadmin';
+    argv.ssrSiteModuleNameWeb = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'vona-module-start-siteweb' : 'vona-module-basic-siteweb';
     argv.ssrSiteOnionName = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'start-siteadmin:admin' : 'basic-siteadmin:admin';
+    argv.ssrSiteOnionNameWeb = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'start-siteweb:web' : 'basic-siteweb:web';
     argv.ssrSiteGroupName = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'start-siteadmin:management' : 'basic-siteadmin:management';
     argv.ssrSiteRestNpm = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'zova-rest-cabloy-start-admin' : 'zova-rest-cabloy-basic-admin';
+    argv.ssrSiteRestNpmWeb = fs.existsSync(path.join(argv.projectPath, 'src/suite/cabloy-start')) ? 'zova-rest-cabloy-start-web' : 'zova-rest-cabloy-basic-web';
     // module name/info
     const moduleName = argv.module;
     argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
@@ -1144,8 +1154,6 @@ class CliCreateModule extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // suite name/info
     const suiteName = argv.suite;
     if (suiteName) {
@@ -1217,8 +1225,6 @@ class CliCreateSuite extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // nameMeta
     const nameMeta = this.helper.parseNameMeta(argv.name);
     const suiteDir = nameMeta.directory || 'suite';
@@ -1251,8 +1257,6 @@ class CliCreateTest extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv.module;
     argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
@@ -1397,8 +1401,6 @@ class CliInitAppMonkey extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // target dir
     const targetDir = path.join(argv.projectPath, 'src/backend/config');
     const monkeyFile = path.join(targetDir, 'monkey.ts');
@@ -1422,8 +1424,6 @@ class CliInitAsset extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv.module;
     argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
@@ -1452,8 +1452,6 @@ class CliInitConfig extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1492,8 +1490,6 @@ class CliInitConstant extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1532,8 +1528,6 @@ class CliInitError extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1583,8 +1577,6 @@ class CliInitLib extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1623,8 +1615,6 @@ class CliInitLocale extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1663,8 +1653,6 @@ class CliInitMain extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1703,8 +1691,6 @@ class CliInitMonkey extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1767,8 +1753,6 @@ class CliInitStatic extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1805,8 +1789,6 @@ class CliInitTypes extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
@@ -1845,8 +1827,6 @@ class CliToolsCrud extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // ssrSiteModuleName
     const isCabloyStart = fs.existsSync(path.join(argv.projectPath, '__CABLOY_START__'));
     argv.ssrSiteModuleName = isCabloyStart ? 'vona-module-start-siteadmin' : 'vona-module-basic-siteadmin';
@@ -1898,8 +1878,6 @@ class CliToolsCrudBasic extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv.module;
     argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
@@ -1944,8 +1922,6 @@ class CliToolsCrudStart extends BeanCliBase {
     } = this.context;
     // super
     await super.execute();
-    // noformat
-    // argv.noformat = true;
     // module name/info
     const moduleName = argv.module;
     argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
@@ -2805,7 +2781,7 @@ var binBuild = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Bin',
-    usage: 'vona :bin:build [--workers=] [--flavor=] [--sourcemap=]'
+    usage: 'npm run vona :bin:build -- [--workers=] [--flavor=] [--sourcemap=]'
   },
   options: {
     workers: {
@@ -2824,7 +2800,7 @@ var binBuildGeneral = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Bin',
-    usage: 'vona :bin:buildGeneral [--minify] [--sourcemap]'
+    usage: 'npm run vona :bin:buildGeneral -- [--minify] [--sourcemap]'
   },
   options: {
     minify: {
@@ -2843,7 +2819,7 @@ var binBuildModule = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Bin',
-    usage: 'vona :bin:buildModule [--minify] [--sourcemap]'
+    usage: 'npm run vona :bin:buildModule -- [--minify] [--sourcemap]'
   },
   options: {
     minify: {
@@ -2862,7 +2838,7 @@ var binDbReset = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: DbReset',
-    usage: 'vona :bin:dbReset [--flavor=]'
+    usage: 'npm run vona :bin:dbReset -- [--flavor=]'
   },
   options: {
     flavor: {
@@ -2877,7 +2853,7 @@ var binDev = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: Dev',
-    usage: 'vona :bin:dev [--workers=] [--flavor=]'
+    usage: 'npm run vona :bin:dev -- [--workers=] [--flavor=]'
   },
   options: {
     workers: {
@@ -2896,7 +2872,7 @@ var binPlay = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: Play',
-    usage: 'vona :bin:play [index.ts] [--flavor=] [--retainRuntime=] [--attach]'
+    usage: 'npm run vona :bin:play [index.ts] -- [--flavor=] [--retainRuntime=] [--attach]'
   },
   options: {
     mode: {
@@ -2924,7 +2900,7 @@ var binTest = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: Test',
-    usage: 'vona :bin:test [--coverage=] [--flavor=]'
+    usage: 'npm run vona :bin:test -- [--coverage=] [--flavor=]'
   },
   options: {
     coverage: {
@@ -2943,7 +2919,7 @@ var binTsc = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: Tsc',
-    usage: 'vona :bin:tsc [--force]'
+    usage: 'npm run vona :bin:tsc -- [--force]'
   },
   options: {
     force: {
@@ -2958,7 +2934,7 @@ var createBean = {
   info: {
     version: '5.0.0',
     title: 'Cli: Create Bean',
-    usage: 'vona :create:bean sceneName beanName [--module=] [--boilerplate=]'
+    usage: 'npm run vona :create:bean sceneName beanName -- [--module=] [--boilerplate=]'
   },
   options: {
     module: {
@@ -3005,7 +2981,7 @@ var createModule = {
   info: {
     version: '5.0.0',
     title: 'Cli: Create Module',
-    usage: 'vona :create:module moduleName [--suite=] [--force]'
+    usage: 'npm run vona :create:module moduleName -- [--suite=] [--force]'
   },
   options: {
     suite: {
@@ -3042,7 +3018,7 @@ var createSuite = {
   info: {
     version: '5.0.0',
     title: 'Cli: Create Suite',
-    usage: 'vona :create:suite suiteName'
+    usage: 'npm run vona :create:suite suiteName'
   },
   options: {},
   groups: {
@@ -3066,7 +3042,7 @@ var createTest = {
   info: {
     version: '5.0.0',
     title: 'Cli: Create Test',
-    usage: 'vona :create:test name [--module=]'
+    usage: 'npm run vona :create:test name -- [--module=]'
   },
   options: {
     module: {
@@ -3119,7 +3095,7 @@ var initAppMonkey = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: App Monkey',
-    usage: 'vona :init:appMonkey'
+    usage: 'npm run vona :init:appMonkey'
   }
   // options: null,
   // groups: null,
@@ -3130,7 +3106,7 @@ var initAsset = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Asset Resources',
-    usage: 'vona :init:asset scene [--module=]'
+    usage: 'npm run vona :init:asset scene -- [--module=]'
   },
   options: {
     module: {
@@ -3164,7 +3140,7 @@ var initConfig = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Config',
-    usage: 'vona :init:config module'
+    usage: 'npm run vona :init:config module'
   }
   // options: null,
   // groups: null,
@@ -3175,7 +3151,7 @@ var initConstant = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Constant',
-    usage: 'vona :init:constant module'
+    usage: 'npm run vona :init:constant module'
   }
   // options: null,
   // groups: null,
@@ -3186,7 +3162,7 @@ var initError = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Error',
-    usage: 'vona :init:error module'
+    usage: 'npm run vona :init:error module'
   }
   // options: null,
   // groups: null,
@@ -3197,7 +3173,7 @@ var initLib = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Lib',
-    usage: 'vona :init:lib module'
+    usage: 'npm run vona :init:lib module'
   }
   // options: null,
   // groups: null,
@@ -3208,7 +3184,7 @@ var initLocale = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Locale',
-    usage: 'vona :init:locale module'
+    usage: 'npm run vona :init:locale module'
   }
   // options: null,
   // groups: null,
@@ -3219,7 +3195,7 @@ var initMain = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Main',
-    usage: 'vona :init:main module'
+    usage: 'npm run vona :init:main module'
   }
   // options: null,
   // groups: null,
@@ -3230,7 +3206,7 @@ var initMonkey = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Monkey',
-    usage: 'vona :init:monkey module'
+    usage: 'npm run vona :init:monkey module'
   }
   // options: null,
   // groups: null,
@@ -3241,7 +3217,7 @@ var initStatic = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Static Resources',
-    usage: 'vona :init:static module'
+    usage: 'npm run vona :init:static module'
   }
   // options: null,
   // groups: null,
@@ -3252,7 +3228,7 @@ var initTypes = {
   info: {
     version: '5.0.0',
     title: 'Cli: Init: Types',
-    usage: 'vona :init:types module'
+    usage: 'npm run vona :init:types module'
   }
   // options: null,
   // groups: null,
@@ -3263,7 +3239,7 @@ var toolsCrud = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Crud',
-    usage: 'vona :tools:crud resourceName [--module=]'
+    usage: 'npm run vona :tools:crud resourceName -- [--module=]'
   },
   options: {
     module: {
@@ -3297,7 +3273,7 @@ var toolsCrudBasic = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Crud Basic',
-    usage: 'vona :tools:crudBasic resourceName [--module=]'
+    usage: 'npm run vona :tools:crudBasic resourceName -- [--module=]'
   },
   options: {
     module: {
@@ -3331,7 +3307,7 @@ var toolsCrudStart = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Crud Start',
-    usage: 'vona :tools:crudStart resourceName [--module=]'
+    usage: 'npm run vona :tools:crudStart resourceName -- [--module=]'
   },
   options: {
     module: {
@@ -3365,7 +3341,7 @@ var toolsDeps = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Deps',
-    usage: 'vona :tools:deps'
+    usage: 'npm run vona :tools:deps'
   },
   options: {}
 };
@@ -3375,7 +3351,7 @@ var toolsMetadata = {
   info: {
     version: '5.0.0',
     title: 'Cli: Tools: Metadata',
-    usage: 'vona :tools:metadata module1 [module2] [--force]'
+    usage: 'npm run vona :tools:metadata module1 [module2] -- [--force]'
   },
   options: {
     force: {

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

@@ -11,9 +11,12 @@ declare module '@cabloy/cli' {
         moduleResourceName: string;
         boilerplate: string;
         ssrSiteModuleName: string;
+        ssrSiteModuleNameWeb: string;
         ssrSiteOnionName: string;
+        ssrSiteOnionNameWeb: string;
         ssrSiteGroupName: string;
         ssrSiteRestNpm: string;
+        ssrSiteRestNpmWeb: string;
     }
 }
 export declare class CliCreateBean extends BeanCliBase {

package/dist-cli/templates/tools/crudBasic/snippets/2-meta.index.js

@@ -9,7 +9,7 @@ export default metadataCustomSnippet({
     format: true,
     init: async ({ cli, argv, targetFile }) => {
         await catchError(() => {
-            return cli.helper.invokeCli([':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata', '--noformat'], {
+            return cli.helper.invokeCli([':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata'], {
                 cwd: argv.projectPath,
             });
         });

package/dist-cli/templates/tools/crudBasic/snippets/2-meta.version.js

@@ -23,7 +23,6 @@ export default metadataCustomSnippet({
                 'version',
                 `--module=${argv.module}`,
                 '--nometadata',
-                '--noformat',
             ], {
                 cwd: argv.projectPath,
             });

package/dist-cli/templates/tools/crudBasic/snippets/3-en-us.js

@@ -8,7 +8,7 @@ export default metadataCustomSnippet({
     language: 'plain',
     init: async ({ cli, argv, targetFile }) => {
         await catchError(() => {
-            return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata', '--noformat'], {
+            return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata'], {
                 cwd: argv.projectPath,
             });
         });

package/dist-cli/templates/tools/crudStart/snippets/2-meta.index.js

@@ -9,7 +9,7 @@ export default metadataCustomSnippet({
     format: true,
     init: async ({ cli, argv, targetFile }) => {
         await catchError(() => {
-            return cli.helper.invokeCli([':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata', '--noformat'], {
+            return cli.helper.invokeCli([':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata'], {
                 cwd: argv.projectPath,
             });
         });

package/dist-cli/templates/tools/crudStart/snippets/2-meta.version.js

@@ -23,7 +23,6 @@ export default metadataCustomSnippet({
                 'version',
                 `--module=${argv.module}`,
                 '--nometadata',
-                '--noformat',
             ], {
                 cwd: argv.projectPath,
             });

package/dist-cli/templates/tools/crudStart/snippets/3-en-us.js

@@ -8,7 +8,7 @@ export default metadataCustomSnippet({
     language: 'plain',
     init: async ({ cli, argv, targetFile }) => {
         await catchError(() => {
-            return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata', '--noformat'], {
+            return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata'], {
                 cwd: argv.projectPath,
             });
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.101",
-  "gitHead": "77e7d321e21482a08f743d441a017f3fb7be43cc",
+  "version": "1.1.103",
+  "gitHead": "7988acec56a1ade34ff3aaea78f152c72957e6af",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",