vona-cli-set-api 1.0.438 → 1.0.442

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

@@ -46,7 +46,8 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.247"
+    "react": "^19.2.3",
+    "vona": "^5.0.249"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/tsconfig.base.esm.json

@@ -5,6 +5,7 @@
     "module": "nodenext",
     "allowImportingTsExtensions": true,
     "rewriteRelativeImportExtensions": true,
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": true,
+    "jsx": "react"
   }
 }

package/cli/templates/tools/crud/boilerplate/src/controller/{{resourceName}}.ts_

@@ -5,11 +5,11 @@ import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.res
 import { BeanBase } from 'vona';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Arg, Controller, Web } from 'vona-module-a-web';
-import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
-import { Dto<%=argv.resourceNameCapitalize%>Query } from '../dto/<%=argv.resourceName%>Query.ts';
-import { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.ts';
-import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
-import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>Query } from '../dto/<%=argv.resourceName%>Query.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
+import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}
 

package/cli/templates/tools/crud/boilerplate/src/dto/{{{resourceName}}Query.ts_ → {{resourceName}}Query.tsx_}

@@ -2,7 +2,7 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
-import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>Query extends IDecoratorDtoOptions {}
 

package/cli/templates/tools/crud/boilerplate/src/model/{{resourceName}}.ts_

@@ -1,6 +1,6 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
 import { BeanModelBase, Model } from 'vona-module-a-orm';
-import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 
 export interface IModelOptions<%=argv.resourceNameCapitalize%> extends IDecoratorModelOptions<Entity<%=argv.resourceNameCapitalize%>> {}
 

package/cli/templates/tools/crud/boilerplate/src/service/{{resourceName}}.ts_

@@ -1,9 +1,9 @@
 import type { TableIdentity } from 'table-identity';
 import type { IQueryParams } from 'vona-module-a-orm';
-import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
-import type { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.ts';
-import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
-import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
+import type { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.tsx';
+import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
+import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';

package/dist/index.js

@@ -7,6 +7,7 @@ import jsonImport from '@rollup/plugin-json';
 import resolveImport from '@rollup/plugin-node-resolve';
 import replaceImport from '@rollup/plugin-replace';
 import terserImport from '@rollup/plugin-terser';
+import typescriptImport from '@rollup/plugin-typescript';
 import fse from 'fs-extra';
 import { globby } from 'globby';
 import { rimraf } from 'rimraf';
@@ -312,6 +313,7 @@ async function generateVonaMeta(configMeta, configOptions) {
 }
 
 const commonjs$2 = commonjsImport;
+const typescript$1 = typescriptImport;
 const resolve$2 = resolveImport;
 // const swc = swcImport as any as typeof swcImport.default;
 const json$2 = jsonImport;
@@ -415,8 +417,9 @@ class CliBinBuild extends BeanCliBase {
         replacement: 'vona-shared'
       });
     }
+    const sourceMap = process.env.BUILD_SOURCEMAP === 'true';
     const replaceValues = generateConfigDefine(env, ['NODE_ENV', 'META_MODE', 'META_FLAVOR']);
-    const babelPluginZovaBeanModule = getAbsolutePathOfModule('babel-plugin-zova-bean-module', '');
+    const babelPluginVonaBeanModule = getAbsolutePathOfModule('babel-plugin-vona-bean-module', '');
     const babelPluginTransformTypescriptMetadata = getAbsolutePathOfModule('babel-plugin-transform-typescript-metadata', '');
     const babelPluginProposalDecorators = getAbsolutePathOfModule('@babel/plugin-proposal-decorators', '');
     const babelPluginTransformClassProperties = getAbsolutePathOfModule('@babel/plugin-transform-class-properties', '');
@@ -428,14 +431,23 @@ class CliBinBuild extends BeanCliBase {
     }), replace({
       values: replaceValues,
       preventAssignment: false
-    }), json$2(), commonjs$2(), babel$2({
-      include: '**/*.ts',
+    }), json$2(), commonjs$2(), typescript$1({
+      module: 'nodenext',
+      compilerOptions: {
+        noCheck: true,
+        declaration: false,
+        composite: false,
+        sourceMap
+      },
+      outputToFilesystem: false
+    }), babel$2({
+      include: '**/*.ts(x)?',
       extensions: ['.ts', '.tsx'],
       babelHelpers: 'bundled',
       skipPreflightCheck: true,
       babelrc: false,
       configFile: false,
-      plugins: [[babelPluginZovaBeanModule, {
+      plugins: [[babelPluginVonaBeanModule, {
         brandName: 'vona'
       }], [babelPluginTransformTypescriptMetadata], [babelPluginProposalDecorators, {
         version: 'legacy'
@@ -463,7 +475,7 @@ class CliBinBuild extends BeanCliBase {
       dir: outDir,
       // file: path.join(projectPath, 'dist/index.js'),
       format: 'esm',
-      sourcemap: process.env.BUILD_SOURCEMAP === 'true',
+      sourcemap: sourceMap,
       // https://github.com/rollup/rollup/issues/4166
       inlineDynamicImports: false // should not true
     };
@@ -506,22 +518,27 @@ class CliBinBuildGeneral extends BeanCliBase {
       argv
     } = this.context;
     const aliasEntries = [];
+    const sourceMap = argv.sourcemap;
+    const babelPluginTransformTypescriptMetadata = getAbsolutePathOfModule('babel-plugin-transform-typescript-metadata', '');
+    const babelPluginProposalDecorators = getAbsolutePathOfModule('@babel/plugin-proposal-decorators', '');
+    const babelPluginTransformClassProperties = getAbsolutePathOfModule('@babel/plugin-transform-class-properties', '');
+    const babelPluginTransformTypescript = getAbsolutePathOfModule('@babel/plugin-transform-typescript', '');
     const plugins = [alias$1({
       entries: aliasEntries
     }), resolve$1({
       preferBuiltins: true
     }), json$1(), commonjs$1(), babel$1({
-      include: '**/*.ts',
+      include: '**/*.ts(x)?',
       extensions: ['.ts', '.tsx'],
       babelHelpers: 'bundled',
       skipPreflightCheck: true,
       babelrc: false,
       configFile: false,
-      plugins: [['babel-plugin-transform-typescript-metadata'], ['@babel/plugin-proposal-decorators', {
+      plugins: [[babelPluginTransformTypescriptMetadata], [babelPluginProposalDecorators, {
         version: 'legacy'
-      }], ['@babel/plugin-transform-class-properties', {
+      }], [babelPluginTransformClassProperties, {
         loose: true
-      }], ['@babel/plugin-transform-typescript']]
+      }], [babelPluginTransformTypescript]]
     })];
     if (argv.minify) {
       plugins.push(terser$1({
@@ -547,7 +564,7 @@ class CliBinBuildGeneral extends BeanCliBase {
       dir: path.join(projectPath, 'dist'),
       // file: path.join(projectPath, 'dist/index.js'),
       format: 'esm',
-      sourcemap: argv.sourcemap,
+      sourcemap: sourceMap,
       // https://github.com/rollup/rollup/issues/4166
       inlineDynamicImports: true
     };
@@ -565,6 +582,7 @@ class CliBinBuildGeneral extends BeanCliBase {
 }
 
 const commonjs = commonjsImport;
+const typescript = typescriptImport;
 const resolve = resolveImport;
 // const swc = swcImport as any as typeof swcImport.default;
 const json = jsonImport;
@@ -596,24 +614,39 @@ class CliBinBuildModule extends BeanCliBase {
         replacement: 'vona-shared'
       });
     }
+    const sourceMap = argv.sourcemap;
+    const babelPluginVonaBeanModule = getAbsolutePathOfModule('babel-plugin-vona-bean-module', '');
+    const babelPluginTransformTypescriptMetadata = getAbsolutePathOfModule('babel-plugin-transform-typescript-metadata', '');
+    const babelPluginProposalDecorators = getAbsolutePathOfModule('@babel/plugin-proposal-decorators', '');
+    const babelPluginTransformClassProperties = getAbsolutePathOfModule('@babel/plugin-transform-class-properties', '');
+    const babelPluginTransformTypescript = getAbsolutePathOfModule('@babel/plugin-transform-typescript', '');
     const plugins = [alias({
       entries: aliasEntries
     }), resolve({
       preferBuiltins: true
-    }), json(), commonjs(), babel({
-      include: '**/*.ts',
+    }), json(), commonjs(), typescript({
+      module: 'nodenext',
+      compilerOptions: {
+        noCheck: true,
+        declaration: false,
+        composite: false,
+        sourceMap
+      },
+      outputToFilesystem: false
+    }), babel({
+      include: '**/*.ts(x)?',
       extensions: ['.ts', '.tsx'],
       babelHelpers: 'bundled',
       skipPreflightCheck: true,
       babelrc: false,
       configFile: false,
-      plugins: [['babel-plugin-zova-bean-module', {
+      plugins: [[babelPluginVonaBeanModule, {
         brandName: 'vona'
-      }], ['babel-plugin-transform-typescript-metadata'], ['@babel/plugin-proposal-decorators', {
+      }], [babelPluginTransformTypescriptMetadata], [babelPluginProposalDecorators, {
         version: 'legacy'
-      }], ['@babel/plugin-transform-class-properties', {
+      }], [babelPluginTransformClassProperties, {
         loose: true
-      }], ['@babel/plugin-transform-typescript']]
+      }], [babelPluginTransformTypescript]]
     })];
     if (argv.minify) {
       plugins.push(terser({
@@ -639,7 +672,7 @@ class CliBinBuildModule extends BeanCliBase {
       dir: path.join(projectPath, 'dist'),
       // file: path.join(projectPath, 'dist/index.js'),
       format: 'esm',
-      sourcemap: argv.sourcemap,
+      sourcemap: sourceMap,
       // https://github.com/rollup/rollup/issues/4166
       inlineDynamicImports: true
     };
@@ -751,7 +784,7 @@ class CliBinDev extends BeanCliBase {
         // execArgs: ['--experimental-transform-types', getImportEsm(), '--trace-deprecation'],
         // signal: 'SIGHUP',
         watch: ['packages-utils', 'packages-vona', './src'],
-        ignore: ['**/node_modules/**', '**/dist/**', '**/test/**/*.test.ts', 'src/backend/play/**', 'src/backend/typing/**', '**/src/config/errors.ts', '**/src/config/locale/*.ts', '**/src/config/config.ts', '**/src/config/constants.ts', '**/src/types/**', '**/src/controller/*.ts', '**/src/model/*.ts', '**/src/service/*.ts', '**/src/bean/*.*.ts']
+        ignore: ['**/node_modules/**', '**/dist/**', '**/test/**/*.test.ts', 'src/backend/play/**', 'src/backend/typing/**', '**/src/config/errors.ts', '**/src/config/locale/*.ts', '**/src/config/config.ts', '**/src/config/constants.ts', '**/src/types/**', '**/src/controller/*.ts', '**/src/model/*.ts', '**/src/service/*.ts', '**/src/bean/*.*.ts', '**/src/dto/*.ts(x)?', '**/src/entity/*.ts(x)?']
       });
       nodemon.on('quit', () => {
         closed = true;
@@ -2048,7 +2081,7 @@ function getScopeModuleName(moduleName) {
 async function globBeanFiles(sceneName, sceneMeta, moduleName, modulePath) {
   const result = [];
   const sceneNameCapitalize = toUpperCaseFirstChar(sceneName);
-  const pattern = sceneMeta.sceneIsolate ? `src/${sceneName}/*.ts` : `src/bean/${sceneName}.*.ts`;
+  const pattern = sceneMeta.sceneIsolate ? `src/${sceneName}/*.ts(x)?` : `src/bean/${sceneName}.*.ts(x)?`;
   const files = await globby(pattern, {
     cwd: modulePath
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.438",
+  "version": "1.0.442",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -33,12 +33,12 @@
     "@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.76",
+    "@cabloy/cli": "^3.0.77",
     "@cabloy/dotenv": "^1.1.12",
     "@cabloy/extend": "^3.1.11",
-    "@cabloy/module-glob": "^5.2.35",
+    "@cabloy/module-glob": "^5.2.36",
     "@cabloy/module-info": "^1.3.32",
-    "@cabloy/utils": "^1.0.49",
+    "@cabloy/utils": "^2.0.1",
     "@cabloy/word-utils": "^2.0.1",
     "@lcov-viewer/cli": "^1.3.0",
     "@rollup/plugin-alias": "^5.1.1",
@@ -48,8 +48,9 @@
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^12.3.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "babel-plugin-zova-bean-module": "^1.1.1",
+    "babel-plugin-vona-bean-module": "^1.0.1",
     "chalk": "^3.0.0",
     "cli-table3": "^0.6.5",
     "compressing": "^1.10.0",
@@ -64,7 +65,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.110",
+    "vona-core": "^5.0.111",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   },