vona-cli-set-api 1.0.401 → 1.0.405

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

@@ -53,7 +53,7 @@ TEST_PATTERNS_IGNORE = '**/test-vona/test/cache/cacheMem.test.ts,**/test-vona/te
 DATABASE_DEFAULT_CLIENT = 'sqlite3' # sqlite3/pg/mysql
 
 DATABASE_CLIENT_SQLITE3_FILENAME =
-DATABASE_CLIENT_SQLITE3_NATIVEBINDING =
+DATABASE_CLIENT_SQLITE3_NATIVEBINDING = false
 
 DATABASE_CLIENT_PG_HOST = 127.0.0.1
 DATABASE_CLIENT_PG_PORT = 5432

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

@@ -7,7 +7,7 @@ SERVER_KEYS = <%=argv.SERVER_KEYS_PROD%>
 DATABASE_DEFAULT_CLIENT = 'sqlite3' # sqlite3/pg/mysql
 
 DATABASE_CLIENT_SQLITE3_FILENAME =
-DATABASE_CLIENT_SQLITE3_NATIVEBINDING = node/better_sqlite3.node
+DATABASE_CLIENT_SQLITE3_NATIVEBINDING = true
 
 DATABASE_CLIENT_PG_HOST = 127.0.0.1
 DATABASE_CLIENT_PG_PORT = 5432

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

@@ -6,9 +6,6 @@ SERVER_LISTEN_DISABLE = true
 
 DATABASE_DEFAULT_CLIENT = 'sqlite3' # sqlite3/pg/mysql
 
-DATABASE_CLIENT_SQLITE3_FILENAME =
-DATABASE_CLIENT_SQLITE3_NATIVEBINDING = node/better_sqlite3.node
-
 DATABASE_CLIENT_PG_HOST = 127.0.0.1
 DATABASE_CLIENT_PG_PORT = 5432
 DATABASE_CLIENT_PG_USER = postgres

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

@@ -11,9 +11,6 @@ BUILD_COPY_DIST = ./docker-compose/output/dist
 
 DATABASE_DEFAULT_CLIENT = 'sqlite3' # sqlite3/pg/mysql
 
-DATABASE_CLIENT_SQLITE3_FILENAME =
-DATABASE_CLIENT_SQLITE3_NATIVEBINDING = node/better_sqlite3.node
-
 DATABASE_CLIENT_PG_HOST = pg # see: docker-compose.yml
 DATABASE_CLIENT_PG_PORT = 5432
 DATABASE_CLIENT_PG_USER = <%=argv.DATABASE_CLIENT_PG_USER%>

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

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

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

@@ -124,6 +124,7 @@ export default async function (app: VonaApplication, env: VonaConfigEnv) {
       io: { keyPrefix: true },
       summer: { keyPrefix: true },
       model: { keyPrefix: true },
+      worker: { keyPrefix: true },
       redlock: {},
       queue: {},
       broadcast: {},

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

@@ -8,13 +8,14 @@ declare module '@cabloy/cli' {
   }
 }
 
-const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-orm\';\n';
-const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';\n';
+const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-orm\';';
+const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';';
 const __snippet_update = '...$tableColumns(() => Entity<%=argv.resourceNameCapitalize%>, \'name\'),';
 
 export default metadataCustomSnippet({
   file: 'src/bean/meta.index.ts',
   language: 'plain',
+  format: true,
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
       return cli.helper.invokeCli([
@@ -32,14 +33,18 @@ export default metadataCustomSnippet({
     // import1
     if (!ast.includes(__snippet_import1)) {
       const code = await cli.template.renderContent({ content: __snippet_import1 });
-      ast = `${code}${ast}`;
+      ast = ast.replace('import { Meta } from \'vona-module-a-meta\';', `import { Meta } from 'vona-module-a-meta';\n${code}`);
     }
     // import2
     let code = await cli.template.renderContent({ content: __snippet_import2 });
-    ast = `${code}${ast}`;
+    ast = ast.replace('import { $tableColumns } from \'vona-module-a-orm\';', `import { $tableColumns } from 'vona-module-a-orm';\n${code}`);
     // update
     code = await cli.template.renderContent({ content: __snippet_update });
-    ast = ast.replace('indexes: {', `indexes: {\n${code}`);
+    if (ast.includes('indexes: {}')) {
+      ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
+    } else {
+      ast = ast.replace('indexes: {', `indexes: {\n    ${code}`);
+    }
     // ok
     return ast;
   },

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

@@ -9,18 +9,20 @@ declare module '@cabloy/cli' {
 }
 
 const __snippet_update = `if (options.version === <%=argv.fileVersion%>) {
-  const entity<%=argv.resourceNameCapitalize%> = this.scope.entity.<%=argv.resourceName%>;
-  await this.bean.model.createTable(entity<%=argv.resourceNameCapitalize%>.$table, table => {
-    table.comment(entity<%=argv.resourceNameCapitalize%>.$comment.$table);
-    table.basicFields();
-    table.string(entity<%=argv.resourceNameCapitalize%>.name, 50).defaultTo(entity<%=argv.resourceNameCapitalize%>.$default.name).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
-    table.string(entity<%=argv.resourceNameCapitalize%>.description, 255).comment(entity<%=argv.resourceNameCapitalize%>.$comment.description);
-  });
-}`;
+    const entity<%=argv.resourceNameCapitalize%> = this.scope.entity.<%=argv.resourceName%>;
+    await this.bean.model.createTable(entity<%=argv.resourceNameCapitalize%>.$table, table => {
+      table.comment(entity<%=argv.resourceNameCapitalize%>.$comment.$table);
+      table.basicFields();
+      table.string(entity<%=argv.resourceNameCapitalize%>.name, 50).defaultTo(entity<%=argv.resourceNameCapitalize%>.$default.name).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
+      table.string(entity<%=argv.resourceNameCapitalize%>.description, 255).comment(entity<%=argv.resourceNameCapitalize%>.$comment.description);
+    });
+  }
+`;
 
 export default metadataCustomSnippet({
   file: 'src/bean/meta.version.ts',
   language: 'gogo',
+  format: true,
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
       return cli.helper.invokeCli([
@@ -38,7 +40,7 @@ export default metadataCustomSnippet({
     // update
     ast.replace('async update(_options: IMetaVersionUpdateOptions) {$$$1}', 'async update(options: IMetaVersionUpdateOptions) {$$$1}');
     const code = await cli.template.renderContent({ content: __snippet_update });
-    ast.replace('async update($$$0) {$$$1}', `async update($$$0) {$$$1 \n ${code}}`);
+    ast.replace('async update($$$0) {$$$1}', `async update($$$0) {\n  $$$1\n  ${code}}`);
     // ok
     return ast;
   },

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

@@ -14,7 +14,7 @@ declare module '@cabloy/cli' {
 
 export default metadataCustomSnippet({
   file: 'src/config/locale/en-us.ts',
-  language: 'gogo',
+  language: 'plain',
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
       return cli.helper.invokeCli([

package/cli/templates/tools/crud/snippets/4-zh-cn.ts

@@ -5,7 +5,7 @@ const __resources = { Name: '名称', Description: '描述' };
 
 export default metadataCustomSnippet({
   file: 'src/config/locale/zh-cn.ts',
-  language: 'gogo',
+  language: 'plain',
   async transform({ ast, argv }) {
     return locale_transform({ ast, argv, resources: __resources });
   },

package/cli/templates/tools/crud/utils.ts

@@ -1,19 +1,19 @@
-export async function locale_transform({ ast, argv, resources }) {
-  const names = Object.keys(resources).concat(argv.resourceNameCapitalize);
-  const nodes = ast.find('export default {$$$0}');
-  for (const name of names) {
-    const node = nodes.match.$$$0.find(node => {
-      return (node as any).key.name === name;
-    });
-    if (!node) {
-      const value = resources[name] ?? argv.resourceNameCapitalize;
-      const code = `${name}: '${value}',`;
-      ast.replace(
-        'export default {$$$0}',
-        `export default { $$$0, \n ${code}}`,
-      );
-    }
+import { evaluateSimple } from '@cabloy/utils';
+
+export async function locale_transform({ ast, argv, resources }: { ast: string; argv: any; resources: any }) {
+  const values = evaluateSimple(ast.replace('export default', '').replace(';', ''));
+  resources = Object.assign(
+    {},
+    resources,
+    { [argv.resourceNameCapitalize]: argv.resourceNameCapitalize },
+    values,
+  );
+  const keys = Object.keys(resources).sort();
+  let content = '';
+  for (const key of keys) {
+    content += `  ${key}: '${resources[key].replaceAll('\'', '\\\'')}',\n`;
   }
+  ast = `export default {\n${content}};\n`;
   // ok
   return ast;
 }