vona-cli-set-api 1.0.498 → 1.1.3

package/cli/templates/create/module/boilerplate/_package.json

@@ -10,10 +10,7 @@
   },
   "exports": {
     ".": {
-      "types": [
-        "./src/index.ts",
-        "./dist/index.d.ts"
-      ],
+      "types": ["./src/index.ts", "./dist/index.d.ts"],
       "import": "./src/index.ts",
       "default": "./dist/index.js"
     },
@@ -22,24 +19,17 @@
   "description": "",
   "keywords": ["Vona Module"],
   "author": "",
-  "files": [
-    "assets",
-    "dist"
-  ],
+  "files": ["assets", "dist", "src"],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
     "postpack": "clean-package restore && npm run clean"
   },
   "clean-package": {
     "indent": 2,
-    "remove": [
-      "clean-package",
-      "devDependencies",
-      "exports.\\..import"
-    ]
+    "remove": ["clean-package", "devDependencies", "exports.\\..import"]
   },
   "dependencies": {},
   "devDependencies": {

package/cli/templates/create/module/boilerplate/_tsconfig.build.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "declaration": true,
+    "declarationMap": true,
     "emitDeclarationOnly": true,
     "outDir": "dist"
   },

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

@@ -0,0 +1,4 @@
+{
+  "recommendations": ["cabloy.vona-vscode", "oxc.oxc-vscode"],
+  "unwantedRecommendations": [],
+}

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

@@ -0,0 +1,51 @@
+{
+  "editor.bracketPairColorization.enabled": true,
+  "editor.guides.bracketPairs": true,
+  // typescript
+  // "js/ts.experimental.useTsgo": true,
+  "js/ts.tsserver.automaticTypeAcquisition.enabled": true,
+  "js/ts.format.enabled": true,
+  "js/ts.implementationsCodeLens.enabled": true,
+  "js/ts.tsserver.useSyntaxServer": "auto",
+  "js/ts.validate.enabled": true,
+  "js/ts.suggest.autoImports": true,
+  "js/ts.suggest.includeCompletionsForImportStatements": true,
+  "js/ts.preferences.importModuleSpecifier": "shortest",
+  "js/ts.preferences.importModuleSpecifierEnding": "js",
+  "js/ts.preferences.includePackageJsonAutoImports": "on",
+  // oxfmt
+  "oxc.fmt.configPath": "oxfmt.config.ts",
+  "editor.defaultFormatter": "oxc.oxc-vscode",
+  "editor.formatOnSave": true,
+  // oxlint
+  "editor.codeActionsOnSave": {
+    "source.fixAll.oxc": "always",
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "oxc.oxc-vscode",
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "oxc.oxc-vscode",
+  },
+  // associations
+  "files.associations": {
+    "*.js.ejs": "javascript",
+    "*.css.ejs": "css",
+    "*.less.ejs": "less",
+    "*.code-snippets": "text",
+    "docker-compose-dockerfile-app": "dockerfile",
+  },
+  // search
+  "search.exclude": {
+    "/.vscode/**": true,
+    "/coverage/**": true,
+    "/docs/**": true,
+    "**/dist/**": true,
+    "/src/backend/app/**": true,
+    "/src/backend/logs/**": true,
+    "/src/backend/run/**": true,
+    "**/node_modules": true,
+  },
+  "search.useIgnoreFiles": false,
+  "hide-my-secrets.hideSecrets": false,
+}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/_.gitignore

@@ -56,16 +56,17 @@ src/backend/typing/mine.d.ts
 
 /src/suite/*
 !/src/suite/.gitkeep
-!/src/suite/a-base
-!/src/suite/a-cms
-!/src/suite/a-flow
 !/src/suite/a-home
-!/src/suite/test-party
+!/src/suite/cabloy-basic
+!/src/suite/cabloy-start
 
 /src/suite-vendor/*
 !/src/suite-vendor/.gitkeep
+!/src/suite-vendor/a-cabloy
 !/src/suite-vendor/a-vona
-!/src/suite-vendor/test-vona
+
+/src/module/*
+!/src/module/.gitkeep
 
 /src/module-vendor/*
 !/src/module-vendor/.gitkeep
@@ -79,3 +80,4 @@ src/backend/typing/mine.d.ts
 sftp-config.json
 sftp-config-.json
 /.assets
+packages-docs/.vitepress/cache

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/env/.env

@@ -14,6 +14,8 @@ SERVER_WORKERS =
 SERVER_LISTEN_HOSTNAME = 0.0.0.0
 SERVER_LISTEN_PORT = 7102
 SERVER_LISTEN_DISABLE =
+SERVER_SERVE_PROTOCOL =
+SERVER_SERVE_HOST =
 
 # project
 

package/cli/templates/create/project/cabloy-basic/boilerplate/oxfmt.config.ts

@@ -0,0 +1,22 @@
+import { oxcFormatConfig } from '@cabloy/lint';
+import { defineConfig } from 'oxfmt';
+
+export default defineConfig(
+  oxcFormatConfig({
+    ignorePatterns: [
+      '*.min.js',
+      '*.code-snippets',
+      '**/dist/**',
+      '**/static/**',
+      '**/.rollup.cache/**',
+      '**/.metadata/index.ts',
+      '.vona',
+      '.assets',
+      'coverage',
+      'docker-compose',
+      'scripts',
+      'zovaRest',
+      'assets',
+    ],
+  }),
+);

package/cli/templates/create/project/cabloy-basic/boilerplate/oxlint.config.ts

@@ -0,0 +1,55 @@
+import { oxcLintConfig } from '@cabloy/lint';
+import { defineConfig } from 'oxlint';
+
+export default defineConfig(
+  oxcLintConfig({
+    ignorePatterns: [
+      '**/node_modules',
+      '**/dist',
+      '**/package-lock.json',
+      '**/yarn.lock',
+      '**/pnpm-lock.yaml',
+      '**/bun.lockb',
+      '**/output',
+      '**/coverage',
+      '**/temp',
+      '**/.temp',
+      '**/tmp',
+      '**/.tmp',
+      '**/.history',
+      '**/.vitepress/cache',
+      '**/.nuxt',
+      '**/.next',
+      '**/.svelte-kit',
+      '**/.vercel',
+      '**/.changeset',
+      '**/.idea',
+      '**/.cache',
+      '**/.output',
+      '**/.vite-inspect',
+      '**/.yarn',
+      '**/vite.config.*.timestamp-*',
+      '**/CHANGELOG*.md',
+      '**/*.min.*',
+      '**/LICENSE*',
+      '**/__snapshots__',
+      '**/auto-import?(s).d.ts',
+      '**/components.d.ts',
+      '**/*.md',
+      '**/*.d.ts',
+      '**/node_modules/**',
+      '**/dist/**',
+      '**/static/**',
+      '**/.rollup.cache/**',
+      '**/.metadata/index.ts',
+      '.vona',
+      '.assets',
+      'coverage',
+      'docker-compose',
+      'package.json',
+      'scripts',
+      'zovaRest',
+      'assets',
+    ],
+  }),
+);

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

@@ -10,11 +10,7 @@
     "url": "git+https://github.com/vonajs/vona.git"
   },
   "author": "zhennann",
-  "keywords": [
-    "nodejs",
-    "vona",
-    "cabloy"
-  ],
+  "keywords": ["nodejs", "vona", "cabloy"],
   "bugs": {
     "url": "https://github.com/vonajs/vona/issues"
   },
@@ -37,14 +33,17 @@
     "start:one": "cross-env SERVER_WORKERS=1 node ./dist/normal/bootstrap.js",
     "start:docker": "cross-env SERVER_WORKERS=1 node ./dist/docker/bootstrap.js",
     "prerun": "vona :tools:deps",
-    "lint": "eslint",
-    "lint:fix": "eslint --fix"
+    "format": "oxfmt --check",
+    "format:fix": "oxfmt --write",
+    "lint": "oxlint",
+    "lint:fix": "oxlint --fix"
   },
   "dependencies": {
-    "vona": "^5.0.280"
+    "vona": "^5.1.1"
   },
   "devDependencies": {
-    "@cabloy/lint": "^5.0.16",
-    "eslint": "^9.39.2"
+    "@cabloy/lint": "^5.0.21",
+    "oxfmt": "^0.41.0",
+    "oxlint": "^1.56.0"
   }
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/pnpm-workspace.yaml

@@ -15,6 +15,7 @@ publicHoistPattern:
   - '*babel*'
   - '*@babel*'
   - '*eslint*'
+  - '*@eslint*'
   - '*types*'
   - lerna
   - vona
@@ -35,5 +36,5 @@ onlyBuiltDependencies:
   - nx
 
 overrides:
-  "@types/mime": "3.0.4"
-  "@types/react": "npm:@cabloy/types-react@^19.2.13"
+  '@types/mime': '3.0.4'
+  '@types/react': 'npm:@cabloy/types-react@^19.2.13'

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/backend/cli.ts

@@ -1,4 +1,5 @@
 import type { ICliBuildCustomOptions } from '@cabloy/cli';
+
 import { copySqlite3NativeBinding } from 'vona';
 
 export async function afterBuild(options: ICliBuildCustomOptions) {

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/backend/config/config/config.ts

@@ -1,9 +1,9 @@
 import type { ILoggerOptionsClientInfo, VonaApplication, VonaConfigEnv, VonaConfigOptional } from 'vona';
 import type { IMailClientRecord, TypeMailTransportService } from 'vona-module-a-mail';
 import type { IDatabaseClientRecord } from 'vona-module-a-orm';
-import type * as Winston from 'winston';
+
 import { replaceTemplate } from '@cabloy/utils';
-import { $customKey, formatLoggerAxiosError, formatLoggerCtx, getLoggerPathPhysicalRoot, getPublicPathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding } from 'vona';
+import { $customKey, getLoggerPathPhysicalRoot, getPublicPathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding } from 'vona';
 
 declare module 'vona' {
   export interface IInstanceRecord {
@@ -56,7 +56,10 @@ export default async function (app: VonaApplication, env: VonaConfigEnv) {
       port: Number.parseInt(env.SERVER_LISTEN_PORT!),
       disable: env.SERVER_LISTEN_DISABLE === 'true',
     },
-    serve: {},
+    serve: {
+      protocol: env.SERVER_SERVE_PROTOCOL,
+      host: env.SERVER_SERVE_HOST,
+    },
   };
 
   // proxy
@@ -82,15 +85,9 @@ export default async function (app: VonaApplication, env: VonaConfigEnv) {
         maxFiles: env.LOGGER_ROTATE_MAXFILES,
       };
     },
-    base(this: VonaApplication, _clientInfo: ILoggerOptionsClientInfo, winston: typeof Winston) {
+    base(this: VonaApplication) {
       return {
-        format: winston.format.combine(
-          formatLoggerAxiosError({ stack: true }),
-          formatLoggerCtx(),
-          winston.format.errors({ stack: true }),
-          winston.format.splat(),
-          winston.format.timestamp(),
-        ),
+        format: this.bean.logger.makeFormatBase({ stack: true }),
         transports: undefined,
       };
     },
@@ -184,7 +181,7 @@ export default async function (app: VonaApplication, env: VonaConfigEnv) {
     clients: {
       system: {
         transport: {
-          service: env.MAIL_SYSTEM_TRANSPORT_SERVICE as TypeMailTransportService || undefined,
+          service: (env.MAIL_SYSTEM_TRANSPORT_SERVICE as TypeMailTransportService) || undefined,
           host: env.MAIL_SYSTEM_TRANSPORT_HOST || undefined,
           port: env.MAIL_SYSTEM_TRANSPORT_PORT ? Number.parseInt(env.MAIL_SYSTEM_TRANSPORT_PORT) : undefined,
           secure: env.MAIL_SYSTEM_TRANSPORT_SECURE === 'true',

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/backend/config/locales.ts

@@ -1,5 +1,7 @@
 import type { TypeLocaleBase, VonaLocaleOptionalMap } from 'vona';
+
 import { $makeLocaleMagic } from 'vona';
+
 import { localeDefault as localeDefault_en_us, localeModules as localeModules_en_us } from './locale/en-us.ts';
 import { localeDefault as localeDefault_zh_cn, localeModules as localeModules_zh_cn } from './locale/zh-cn.ts';
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/backend/typing/env.d.ts

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// eslint-disable
 
 declare namespace NodeJS {
   interface ProcessEnv {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-base/package.json

@@ -1,18 +1,17 @@
 {
   "name": "vona-module-home-base",
-  "type": "module",
-  "version": "5.0.17",
-  "title": "home-base",
-  "vonaModule": {
-    "dependencies": {
-      "a-vona": "5.0.0"
-    }
-  },
+  "version": "5.1.1",
   "description": "",
-  "author": "",
   "keywords": [
     "Vona Module"
   ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -24,18 +23,18 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "assets",
-    "dist"
-  ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
     "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.0.1"
+  },
   "clean-package": {
     "indent": 2,
     "remove": [
@@ -43,8 +42,10 @@
       "exports.\\..import"
     ]
   },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.0.1"
+  "title": "home-base",
+  "vonaModule": {
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
   }
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// eslint-disable
 import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** service: begin */
 export * from '../service/menu.ts';

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-base/src/controller/menu.ts

@@ -1,8 +1,10 @@
 import type { IMenus } from 'vona-module-a-menu';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
 import { BeanBase } from 'vona';
 import { DtoMenus } from 'vona-module-a-menu';
 import { Api, v } from 'vona-module-a-openapiutils';
+import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 
 export interface IControllerOptionsMenu extends IDecoratorControllerOptions {}
@@ -11,6 +13,7 @@ export interface IControllerOptionsMenu extends IDecoratorControllerOptions {}
 export class ControllerMenu extends BeanBase {
   @Web.get(':publicPath?')
   @Api.body(v.object(DtoMenus))
+  @Passport.public()
   async retrieveMenus(@Arg.param('publicPath', v.optional()) publicPath?: string): Promise<IMenus> {
     return await this.scope.service.menu.retrieveMenus(publicPath);
   }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-base/src/controller/permission.ts

@@ -1,5 +1,6 @@
 import type { IOpenapiPermissions, IResourceRecord } from 'vona-module-a-openapi';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
 import { BeanBase } from 'vona';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { DtoPermissions } from 'vona-module-a-permission';

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-base/src/main.ts

@@ -1,4 +1,5 @@
 import type { IModuleMain } from 'vona';
+
 import { BeanSimple } from 'vona';
 import { en, zhCN } from 'zod/locales';
 

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/a-home/modules/home-base/src/service/menu.ts

@@ -0,0 +1,19 @@
+import type { IMenus } from 'vona-module-a-menu';
+
+import { BeanBase } from 'vona';
+import { Service } from 'vona-module-a-bean';
+
+@Service()
+export class ServiceMenu extends BeanBase {
+  async retrieveMenus(publicPath?: string): Promise<IMenus> {
+    const res = await this.bean.ssr.retrieveMenus(publicPath);
+    if (res) return res;
+    return this._getMenusDefault();
+  }
+
+  private _getMenusDefault(): IMenus {
+    return {
+      menus: [{ name: 'home', title: this.$scope.homeIndex.locale.Home(), icon: '::home', link: '/' }],
+    };
+  }
+}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-base/src/service/permission.ts

@@ -1,4 +1,5 @@
 import type { IOpenapiPermissions, IResourceRecord } from 'vona-module-a-openapi';
+
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 

package/cli/templates/create/project/{basic/boilerplate/src/suite/a-home/modules/home-user → cabloy-basic/boilerplate/src/suite/a-home/modules/home-base}/tsconfig.build.json

@@ -3,12 +3,9 @@
   "compilerOptions": {
     "rootDir": "src",
     "declaration": true,
+    "declarationMap": true,
     "emitDeclarationOnly": true,
     "outDir": "dist"
   },
-  "include": [
-    "src",
-    "src/.metadata/*.ts",
-    "src/**/*.json"
-  ]
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/package.json

@@ -1,18 +1,17 @@
 {
   "name": "vona-module-home-index",
-  "type": "module",
-  "version": "5.0.17",
-  "title": "home-index",
-  "vonaModule": {
-    "dependencies": {
-      "a-vona": "5.0.0"
-    }
-  },
+  "version": "5.1.1",
   "description": "",
-  "author": "",
   "keywords": [
     "Vona Module"
   ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -24,18 +23,18 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "assets",
-    "dist"
-  ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
     "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.0.1"
+  },
   "clean-package": {
     "indent": 2,
     "remove": [
@@ -43,8 +42,10 @@
       "exports.\\..import"
     ]
   },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.0.1"
+  "title": "home-index",
+  "vonaModule": {
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
   }
 }

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

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// eslint-disable
 import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** meta: begin */
 export * from '../bean/meta.printTip.ts';
@@ -67,6 +67,7 @@ declare module 'vona-module-a-web' {
     }
 
 }
+
 /** controller: end */
 /** locale: begin */
 import { locales } from './locales.ts';

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/src/bean/meta.printTip.ts

@@ -1,4 +1,5 @@
 import type { IMetaPrintTipExecute, TypeMetaPrintTipResult } from 'vona-module-a-printtip';
+
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/src/controller/home.ts

@@ -1,8 +1,10 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
 import { BeanBase } from 'vona';
 import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
+
 import { $locale } from '../.metadata/locales.ts';
 
 export interface IControllerOptionsHome extends IDecoratorControllerOptions {}

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

@@ -0,0 +1,15 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+describe('home.test.ts', () => {
+  it('action:home', async () => {
+    await app.bean.executor.mockCtx(
+      async () => {
+        const res = await app.bean.executor.performAction('get', '//');
+        assert.equal(res, 'Hello Vona!');
+      },
+      { locale: 'en-us' },
+    );
+  });
+});

package/cli/templates/create/project/{basic/boilerplate/src/suite/a-home/modules/home-base → cabloy-basic/boilerplate/src/suite/a-home/modules/home-index}/tsconfig.build.json

@@ -3,12 +3,9 @@
   "compilerOptions": {
     "rootDir": "src",
     "declaration": true,
+    "declarationMap": true,
     "emitDeclarationOnly": true,
     "outDir": "dist"
   },
-  "include": [
-    "src",
-    "src/.metadata/*.ts",
-    "src/**/*.json"
-  ]
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
 }