@jayfong/x-server 1.26.9 → 1.27.2

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.27.2](https://github.com/jfWorks/x-server/compare/v1.27.1...v1.27.2) (2022-05-11)
+
+
+### Bug Fixes
+
+* api gen GET ([601d94a](https://github.com/jfWorks/x-server/commit/601d94a9abd4a33a91f805dae74a0a471ba2cd59))
+
+### [1.27.1](https://github.com/jfWorks/x-server/compare/v1.27.0...v1.27.1) (2022-05-08)
+
+
+### Bug Fixes
+
+* api ([d30109c](https://github.com/jfWorks/x-server/commit/d30109ce90db1f3f9c513b9867be6123bc6373e6))
+
+## [1.27.0](https://github.com/jfWorks/x-server/compare/v1.26.9...v1.27.0) (2022-05-07)
+
+
+### Features
+
+* 添加 fastifyOptions ([0be0509](https://github.com/jfWorks/x-server/commit/0be0509adb2bfcc24ff0122b1f5d52a155370738))
+
 ### [1.26.9](https://github.com/jfWorks/x-server/compare/v1.26.8...v1.26.9) (2022-05-07)
 
 

package/lib/_cjs/cli/api_generator.js

@@ -186,7 +186,25 @@ class ApiGenerator {
 
     for (const handle of handles) {
       data[handle.category] = data[handle.category] || [];
-      data[handle.category].push(handle.handlerMethod === 'FILE' ? {
+      data[handle.category].push(handle.handlerMethod === 'GET' ? {
+        method: handle.method.toUpperCase(),
+        title: handle.name,
+        path: handle.path,
+        req_body_type: 'query',
+        res_body_type: 'json',
+        req_body_is_json_schema: false,
+        res_body_is_json_schema: true,
+        req_params: [],
+        req_query: handle.requestData.children.map(item => ({
+          required: item.required ? 1 : 0,
+          name: item.name,
+          desc: item.desc,
+          type: 'string'
+        })),
+        req_headers: [],
+        req_body_form: [],
+        res_body: JSON.stringify(handle.responseDataJsonSchema)
+      } : handle.handlerMethod === 'FILE' ? {
         method: handle.method.toUpperCase(),
         title: handle.name,
         path: handle.path,
@@ -200,6 +218,7 @@ class ApiGenerator {
         req_body_form: handle.requestData.children.map(item => ({
           required: item.required ? 1 : 0,
           name: item.name,
+          desc: item.desc,
           type: item.type === 'file' ? 'file' : 'text'
         })),
         res_body: JSON.stringify(handle.responseDataJsonSchema)
@@ -241,7 +260,7 @@ class ApiGenerator {
 
     for (const handlerList of handlerGroup) {
       const handlerListSourceFile = this.getTypeBySymbol(handlerList).getProperties()[0].getDeclarations()[0].getSourceFile();
-      const basePath = `/${(0, _vtils.snakeCase)(handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1]).replace(/_/g, '/')}/`.replace(/\/{2,}/g, '/');
+      const basePath = `/${handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1].replace(/(^|\/)index$/, '/').split('/').map(v => (0, _vtils.snakeCase)(v)).join('/')}/`.replace(/\/{2,}/g, '/');
 
       for (const handler of handlerListSourceFile.getVariableStatements().filter(item => item.isExported())) {
         // 重要：这一步必须，先调一遍 getText 获取看到的对象，后续对于复杂定义才不会报错
@@ -259,7 +278,7 @@ class ApiGenerator {
           continue;
         }
 
-        const handlerCategory = (0, _vtils.pascalCase)(basePath) || 'ROOT';
+        const handlerCategory = (0, _vtils.pascalCase)(basePath) || 'Index';
         const handlerName = handlerComment.description || handlerPath;
         const handlerMethod = methodType.getLiteralValueOrThrow();
         const serverMethod = _http_method.HandlerMethodToHttpMethod[handlerMethod];

package/lib/_cjs/core/server.js

@@ -45,7 +45,8 @@ class Server {
     this.fastify = (0, _fastify.default)({
       logger: process.env.NODE_ENV === 'development' ? {
         prettyPrint: true
-      } : false
+      } : false,
+      ...this.options.fastifyOptions
     });
   }
 

package/lib/cli/api_generator.js

@@ -170,7 +170,25 @@ export class ApiGenerator {
 
     for (const handle of handles) {
       data[handle.category] = data[handle.category] || [];
-      data[handle.category].push(handle.handlerMethod === 'FILE' ? {
+      data[handle.category].push(handle.handlerMethod === 'GET' ? {
+        method: handle.method.toUpperCase(),
+        title: handle.name,
+        path: handle.path,
+        req_body_type: 'query',
+        res_body_type: 'json',
+        req_body_is_json_schema: false,
+        res_body_is_json_schema: true,
+        req_params: [],
+        req_query: handle.requestData.children.map(item => ({
+          required: item.required ? 1 : 0,
+          name: item.name,
+          desc: item.desc,
+          type: 'string'
+        })),
+        req_headers: [],
+        req_body_form: [],
+        res_body: JSON.stringify(handle.responseDataJsonSchema)
+      } : handle.handlerMethod === 'FILE' ? {
         method: handle.method.toUpperCase(),
         title: handle.name,
         path: handle.path,
@@ -184,6 +202,7 @@ export class ApiGenerator {
         req_body_form: handle.requestData.children.map(item => ({
           required: item.required ? 1 : 0,
           name: item.name,
+          desc: item.desc,
           type: item.type === 'file' ? 'file' : 'text'
         })),
         res_body: JSON.stringify(handle.responseDataJsonSchema)
@@ -225,7 +244,7 @@ export class ApiGenerator {
 
     for (const handlerList of handlerGroup) {
       const handlerListSourceFile = this.getTypeBySymbol(handlerList).getProperties()[0].getDeclarations()[0].getSourceFile();
-      const basePath = `/${snakeCase(handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1]).replace(/_/g, '/')}/`.replace(/\/{2,}/g, '/');
+      const basePath = `/${handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1].replace(/(^|\/)index$/, '/').split('/').map(v => snakeCase(v)).join('/')}/`.replace(/\/{2,}/g, '/');
 
       for (const handler of handlerListSourceFile.getVariableStatements().filter(item => item.isExported())) {
         // 重要：这一步必须，先调一遍 getText 获取看到的对象，后续对于复杂定义才不会报错
@@ -243,7 +262,7 @@ export class ApiGenerator {
           continue;
         }
 
-        const handlerCategory = pascalCase(basePath) || 'ROOT';
+        const handlerCategory = pascalCase(basePath) || 'Index';
         const handlerName = handlerComment.description || handlerPath;
         const handlerMethod = methodType.getLiteralValueOrThrow();
         const serverMethod = HandlerMethodToHttpMethod[handlerMethod];

package/lib/core/server.js

@@ -32,7 +32,8 @@ export class Server {
     this.fastify = Fastify({
       logger: process.env.NODE_ENV === 'development' ? {
         prettyPrint: true
-      } : false
+      } : false,
+      ...this.options.fastifyOptions
     });
   }
 

package/lib/core/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { BasePlugin } from '../plugins/base';
 import { BaseService } from '../services/base';
-import { FastifyReply, FastifyRequest } from 'fastify';
+import { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
 import { yup } from 'vtils/validator';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
 import type { DisposeService } from '../services/dispose';
@@ -31,6 +31,10 @@ export declare namespace XServer {
          * 监听端口
          */
         port: number;
+        /**
+         * 透传给 Fastify 的选项
+         */
+        fastifyOptions?: FastifyServerOptions;
         /**
          * 服务列表
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.26.9",
+  "version": "1.27.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",