create-aomex 0.0.63 → 0.0.64

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "create-aomex",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "repository": "git@github.com:aomex/create-aomex.git",
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "cli": "rm -rf hello-aomex && tsx src/index.ts --project=HelloAomex --node v20.16.0",
+    "cli": "rm -rf hello-aomex && tsx src/index.ts --project=HelloAomex --node v22.8.0",
     "release": "release-it --ci",
     "build": "tsup",
     "prepublishOnly": "tsup"
   },
   "volta": {
-    "node": "20.15.0",
-    "pnpm": "9.4.0"
+    "node": "22.8.0",
+    "pnpm": "10.8.1"
   },
   "engines": {
-    "node": ">=20.13.0"
+    "node": ">=22.8.0"
   },
+  "packageManager": "pnpm@10.8.1",
   "publishConfig": {
     "access": "public"
   },
@@ -28,40 +29,39 @@
     "README.md"
   ],
   "bin": "dist/index.js",
-  "packageManager": "pnpm@9.4.0",
   "dependencies": {
-    "@aomex/common": "^3.17.1",
-    "@aomex/console": "^3.17.1",
-    "@inquirer/prompts": "^7.1.0",
+    "@aomex/common": "^3.25.0",
+    "@aomex/console": "^3.25.0",
+    "@inquirer/prompts": "^7.4.1",
     "sanitize-filename": "^1.6.3",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@aomex/async-trace": "^3.17.1",
-    "@aomex/auth": "^3.17.1",
-    "@aomex/cache": "^3.17.1",
-    "@aomex/cache-redis-adapter": "^3.17.1",
-    "@aomex/compress": "^3.17.1",
-    "@aomex/cors": "^3.17.1",
-    "@aomex/cron": "^3.17.1",
-    "@aomex/etag": "^3.17.1",
-    "@aomex/helmet": "^3.17.1",
-    "@aomex/http-logger": "^3.17.1",
-    "@aomex/logger": "^3.17.1",
-    "@aomex/openapi": "^3.17.1",
-    "@aomex/prisma": "^3.17.1",
-    "@aomex/response-time": "^3.17.1",
-    "@aomex/swagger-ui": "^3.17.1",
-    "@aomex/web": "^3.17.1",
-    "@prisma/client": "^5.22.0",
+    "@aomex/async-trace": "^3.25.0",
+    "@aomex/auth": "^3.25.0",
+    "@aomex/cache": "^3.25.0",
+    "@aomex/cache-redis-adapter": "^3.25.0",
+    "@aomex/compress": "^3.25.0",
+    "@aomex/cors": "^3.25.0",
+    "@aomex/cron": "^3.25.0",
+    "@aomex/etag": "^3.25.0",
+    "@aomex/helmet": "^3.25.0",
+    "@aomex/http-logger": "^3.25.0",
+    "@aomex/logger": "^3.25.0",
+    "@aomex/openapi": "^3.25.0",
+    "@aomex/prisma": "^3.25.0",
+    "@aomex/response-time": "^3.25.0",
+    "@aomex/swagger-ui": "^3.25.0",
+    "@aomex/web": "^3.25.0",
+    "@prisma/client": "^6.6.0",
     "@types/lodash.kebabcase": "^4.1.9",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.14.1",
     "@types/yargs-parser": "^21.0.3",
-    "ioredis": "^5.4.1",
-    "prisma": "^5.22.0",
-    "release-it": "^17.10.0",
-    "tsup": "^8.3.5",
-    "tsx": "^4.19.2",
-    "typescript": "^5.6.3"
+    "ioredis": "^5.6.1",
+    "prisma": "^6.6.0",
+    "release-it": "^19.0.1",
+    "tsup": "^8.4.0",
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.3"
   }
 }

package/templates/src/cli.ts

@@ -20,7 +20,7 @@ const app = new ConsoleApp({
 });
 
 app.on('error', (err) => {
-  logger.error(err.stack || '');
+  logger.error(err.stack!);
 });
 
 const code = await app.run();

package/templates/src/commanders/hello.cmd.ts

@@ -1,6 +1,5 @@
 import { Commander, options } from '@aomex/console';
-import { rule, sleep } from '@aomex/common';
-import { cron } from '@aomex/cron';
+import { rule } from '@aomex/common';
 
 export const commander = new Commander();
 
@@ -27,30 +26,3 @@ commander.create('hello', {
     console.log(`Hello ${user}`);
   },
 });
-
-/**
- * 定时任务示例
- *
- * npx aomex cron:start 启动
- * npx aomex cron:stop 结束
- * npx aomex cron:stats 运行状态
- * npx aomex cron:eject 查看列表
- */
-commander.create('hello:cron', {
-  docs: {
-    summary: '执行 npx aomex -h 可以看到我',
-    description: '执行 npx aomex hello:cron -h 可以看到我',
-  },
-  mount: [
-    // cron({ second: '*/15' }),
-    cron({ minute: '*', args: ['--user', 'Boss'] }),
-    options({
-      user: rule.string().default('World'),
-    }),
-  ],
-  action: async (ctx) => {
-    const { user } = ctx.options;
-    console.log(`Hello ${user}`);
-    await sleep(5_000);
-  },
-});

package/templates/src/i18n/index.ts

@@ -15,4 +15,4 @@ export const i18n = new I18n({
 });
 
 // 检查不同语言包的缺失字段（相对于默认语言）
-export type I18nMissingKeys = typeof i18n.missingKeys;
+export type I18nMissingKeys = typeof i18n.missingPath;

package/templates/src/middleware/slow-trace.md.ts

@@ -0,0 +1,8 @@
+import { traceMiddleware } from '@aomex/async-trace';
+import type { WebContext } from '@aomex/web';
+
+export const slowTrace = traceMiddleware('生命周期', async (record, _ctx: WebContext) => {
+  if (record.delta > 2_000) {
+    // 上报慢日志
+  }
+});

package/templates/src/routers/hello.router.ts

@@ -1,19 +1,20 @@
 import { rule } from '@aomex/common';
-import { response, Router } from '@aomex/web';
-import { counter } from '@middleware/counter.md';
-import { i18n } from '../i18n';
+import { query, response, Router } from '@aomex/web';
 
 export const router = new Router();
 
 router.get('/', {
   mount: [
-    counter,
+    query({
+      user: rule.string().optional(),
+    }),
     response({
       statusCode: 200,
       content: rule.string(),
     }),
   ],
   action: (ctx) => {
-    ctx.send(`${i18n.t('hello', { count: ctx.visitCount })}`);
+    const { user = 'World' } = ctx.query;
+    ctx.send(`Hello ${user}`);
   },
 });

package/templates/src/web.ts

@@ -5,29 +5,27 @@ import { etag } from '@aomex/etag';
 import { helmet } from '@aomex/helmet';
 import { responseTime } from '@aomex/response-time';
 import { swagger } from '@middleware/swagger.md';
-import { i18nProvider } from '@middleware/i18n-provider.md';
-import { trace } from '@middleware/trace.md';
+import { slowTrace } from '@middleware/slow-trace.md';
 import { httpLogger } from '@middleware/http-logger.md';
 import { logger } from '@services/logger';
 
 export const app = new WebApp({
   language: 'zh_CN',
   mount: [
-    i18nProvider,
     httpLogger,
     responseTime,
+    slowTrace,
     cors(),
     compress(),
     etag(),
     swagger,
     helmet(),
-    trace,
     routers('./src/routers'),
   ],
 });
 
 app.on('error', (err, ctx) => {
-  logger.error(err.stack || '');
+  logger.error(err.stack!);
   ctx.response.body = {
     status: ctx.response.statusCode,
     message: ctx.response.body,

package/templates/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es2022",
     "module": "es2022",
-    "lib": ["es2022"],
+    "lib": ["ESNext"],
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -39,7 +39,9 @@
       "@middleware/*": ["./src/middleware/*"],
       "@services": ["./src/services/index.ts"],
       "@services/*": ["./src/services/*"],
-      "@constants/*": ["./sr/constants/*"]
+      "@constants/*": ["./src/constants/*"],
+      "@models/*": ["./src/models/*"],
+      "@utils/*": ["./src/utils/*"]
     }
   }
 }

package/templates/src/middleware/counter.md.ts

@@ -1,8 +0,0 @@
-import { middleware } from '@aomex/common';
-
-let _counter = 0;
-
-export const counter = middleware.mixin<{ readonly visitCount: number }>(async (ctx, next) => {
-  ctx.visitCount = ++_counter;
-  await next();
-});

package/templates/src/middleware/trace.md.ts

@@ -1,7 +0,0 @@
-import { traceMiddleware } from '@aomex/async-trace';
-import type { WebContext } from '@aomex/web';
-
-export const trace = traceMiddleware('生命周期', async (_record, _ctx: WebContext) => {
-  // 根据 record.delta 上报慢日志
-  // console.log(record);
-});