@faapi/faapi 0.0.0-canary.2a7b6a3 → 0.0.0-canary.9a79cdf

package/dist/index.d.ts

@@ -307,6 +307,8 @@ interface LoggerOptions {
  * before/after 一体，闭包变量共享开始时间，无需污染 ctx。
  * 错误用 try/catch 捕获，记录后重新抛出（让上层处理）。
  * 成功时从 next() 返回的 Response 读取状态码。
+ *
+ * log 函数每次请求时读取（options.log ?? console.log），运行时替换 console.log 会生效。
  */
 declare function logger(options?: LoggerOptions): FaapiMiddleware;
 
@@ -810,6 +812,13 @@ type RuntimeType = {
     kind: 'record';
     key: RuntimeType;
     value: RuntimeType;
+} | {
+    kind: 'map';
+    key: RuntimeType;
+    value: RuntimeType;
+} | {
+    kind: 'set';
+    element: RuntimeType;
 } | {
     kind: 'ref';
     name: string;
@@ -949,6 +958,18 @@ interface RouteSchemaSource {
     filePath: string;
     schemaName: string;
     typeInfo: HandlerTypeInfo | null;
+    /**
+     * 是否对 number/boolean 字段生成 z.preprocess 字符串转换（coerce）。
+     *
+     * - query/params：始终 coerce=true（URL 来源均为 string）
+     * - body：始终 coerce=false（JSON 解析已是天然 JS 类型）
+     * - form：coerce=true（form-urlencoded 来源均为 string），由本函数在提取时
+     *   检测到 handler 声明 `form` 参数时显式设置。schema 名仍为 `POSTBody`
+     *   （与 body 共享运行时 schema key），运行时 validateInput 无需感知 form/body 差异。
+     *
+     * 未设置时由 generateSchemaFileSource 回退到 schemaName 后缀正则推断（Query/Params → true）。
+     */
+    coerce?: boolean;
 }
 /**
  * 从路由清单收集 schema 提取所需的原始数据
@@ -1061,6 +1082,8 @@ interface CreateAppOptions {
     rootDir?: string;
     /** 源码目录前缀，覆盖环境变量 FAAPI_APP_DIR，默认 'src' */
     appDir?: string;
+    /** 产物输出目录，覆盖环境变量 FAAPI_OUT_DIR，默认 'dist' */
+    outDir?: string;
     /** 端口号，也可在 listen() 时传入；默认环境变量 PORT 或 3000 */
     port?: number;
 }

package/dist/index.js

@@ -290,10 +290,35 @@ function resolveTypeReference(typeNode, checker, visited = /* @__PURE__ */ new S
     const properties = typeName === "Pick" ? innerType.properties.filter((p) => keySet.has(p.name)) : innerType.properties.filter((p) => !keySet.has(p.name));
     return { kind: "object", properties };
   }
-  if (typeName === "Map" || typeName === "Set" || typeName === "WeakMap" || typeName === "WeakSet") {
+  if (typeName === "Map") {
+    if (!typeNode.typeArguments || typeNode.typeArguments.length !== 2) {
+      throw new SchemaExtractionError(
+        typeNode.getText(),
+        "Map \u5FC5\u987B\u5E26 2 \u4E2A\u7C7B\u578B\u53C2\u6570\uFF0C\u5982 Map<K, V>\uFF0C\u88F8 Map \u4E0D\u652F\u6301"
+      );
+    }
+    return {
+      kind: "map",
+      key: resolveTypeNode(typeNode.typeArguments[0], checker, visited),
+      value: resolveTypeNode(typeNode.typeArguments[1], checker, visited)
+    };
+  }
+  if (typeName === "Set") {
+    if (!typeNode.typeArguments || typeNode.typeArguments.length !== 1) {
+      throw new SchemaExtractionError(
+        typeNode.getText(),
+        "Set \u5FC5\u987B\u5E26 1 \u4E2A\u7C7B\u578B\u53C2\u6570\uFF0C\u5982 Set<T>\uFF0C\u88F8 Set \u4E0D\u652F\u6301"
+      );
+    }
+    return {
+      kind: "set",
+      element: resolveTypeNode(typeNode.typeArguments[0], checker, visited)
+    };
+  }
+  if (typeName === "WeakMap" || typeName === "WeakSet") {
     throw new SchemaExtractionError(
       typeNode.getText(),
-      `${typeName} \u8FD0\u884C\u65F6\u65E0\u6CD5\u6821\u9A8C\uFF0C\u8BF7\u6539\u7528\u5BF9\u8C61\u6216\u6570\u7EC4`
+      `${typeName} \u8FD0\u884C\u65F6\u65E0\u6CD5\u679A\u4E3E\u6821\u9A8C\uFF0C\u8BF7\u6539\u7528 Map / Set \u6216\u5BF9\u8C61`
     );
   }
   if (typeName === "Promise") {
@@ -650,6 +675,7 @@ import ts4 from "typescript";
 var PARAM_TYPE_MAP = {
   query: "query",
   body: "body",
+  form: "form",
   headers: "headers",
   params: "params",
   context: "context",
@@ -807,9 +833,16 @@ function collectRouteSchemaSources(routes, rootDir) {
       const inputType = getInputTypeForMethod(method);
       const schemaName = getSchemaName(method, inputType);
       const meta = analyzeInjection(code, method);
-      const param = meta.params.find((p) => p.type === inputType);
+      const param = meta.params.find((p) => p.type === inputType) ?? (inputType === "body" ? meta.params.find((p) => p.type === "form") : void 0);
+      const isForm = param?.type === "form";
       const typeInfo = param?.typeName ? extractTypeInfo(program, filePath, param.typeName) : null;
-      sources.push({ urlPath: entry.urlPath, filePath, schemaName, typeInfo });
+      sources.push({
+        urlPath: entry.urlPath,
+        filePath,
+        schemaName,
+        typeInfo,
+        coerce: isForm || void 0
+      });
     }
   }
   return { sources, allTypesByFile, mergedAllTypes };
@@ -882,8 +915,8 @@ function cors(options = {}) {
 
 // src/middleware/logger.ts
 function logger(options = {}) {
-  const { log = console.log } = options;
   return async (ctx, next) => {
+    const log = options.log ?? console.log;
     const start = Date.now();
     try {
       const response = await next();
@@ -1649,6 +1682,10 @@ function getBuiltinInjectionValue(type, ctx, body) {
       return ctx.ip;
     case "body":
       return body;
+    // form 与 body 共享解析结果（resolveInput 已按 Content-Type 解析 form-urlencoded）
+    // 差异仅在 schema 校验（form coerce=true，由 collectRouteSchemaSources 标记）
+    case "form":
+      return body;
     case "files":
       if (body && typeof body === "object" && "files" in body) {
         return body.files;
@@ -2175,6 +2212,13 @@ function collectNamedTypes(type, ctx) {
       collectNamedTypes(type.key, ctx);
       collectNamedTypes(type.value, ctx);
       return;
+    case "map":
+      collectNamedTypes(type.key, ctx);
+      collectNamedTypes(type.value, ctx);
+      return;
+    case "set":
+      collectNamedTypes(type.element, ctx);
+      return;
     case "ref": {
       if (ctx.namedTypes.has(type.name)) return;
       ctx.namedTypes.set(type.name, { kind: "any" });
@@ -2264,6 +2308,10 @@ function baseExpression(type, ctx) {
       return 'z.preprocess((v) => (typeof v === "string" ? new Date(v) : v), z.date())';
     case "record":
       return `z.record(${runtimeTypeToZodExpression(type.key, ctx)}, ${runtimeTypeToZodExpression(type.value, ctx)})`;
+    case "map":
+      return `z.preprocess(coerceMap, z.map(${runtimeTypeToZodExpression(type.key, ctx)}, ${runtimeTypeToZodExpression(type.value, ctx)}))`;
+    case "set":
+      return `z.preprocess(coerceSet, z.set(${runtimeTypeToZodExpression(type.element, ctx)}))`;
     case "ref":
       if (type.name === ctx.entryTypeName) {
         return `${ctx.entryExportName}Schema`;
@@ -2273,17 +2321,21 @@ function baseExpression(type, ctx) {
 }
 var COERCE_NUMBER_HELPER = 'export const coerceNumber = (v) => typeof v === "string" && v.trim() !== "" && !isNaN(Number(v)) ? Number(v) : v;';
 var COERCE_BOOLEAN_HELPER = 'export const coerceBoolean = (v) => v === "true" || v === "1" ? true : v === "false" || v === "0" ? false : v;';
+var COERCE_MAP_HELPER = 'export const coerceMap = (v) => Array.isArray(v) ? new Map(v) : v instanceof Map ? v : (v && typeof v === "object" ? new Map(Object.entries(v)) : v);';
+var COERCE_SET_HELPER = "export const coerceSet = (v) => v instanceof Set ? v : (Array.isArray(v) ? new Set(v) : v);";
 var HELPERS_FILENAME = "faapi-helpers.js";
 function generateHelpersFileSource() {
   return [
     "// faapi-helpers.js \u2014 faapi \u81EA\u52A8\u751F\u6210\u7684\u516C\u7528\u51FD\u6570\uFF08\u8BF7\u52FF\u624B\u52A8\u7F16\u8F91\uFF09",
     COERCE_NUMBER_HELPER,
     COERCE_BOOLEAN_HELPER,
+    COERCE_MAP_HELPER,
+    COERCE_SET_HELPER,
     ""
   ].join("\n");
 }
 function usesCoerceHelpers(code) {
-  return code.includes("coerceNumber") || code.includes("coerceBoolean");
+  return code.includes("coerceNumber") || code.includes("coerceBoolean") || code.includes("coerceMap") || code.includes("coerceSet");
 }
 function wrapCoercePreprocess(kind, inner) {
   if (kind === "number") {
@@ -2370,6 +2422,10 @@ function containsRef(type, visited) {
       return type.members.some((m) => containsRef(m, visited));
     case "record":
       return containsRef(type.key, visited) || containsRef(type.value, visited);
+    case "map":
+      return containsRef(type.key, visited) || containsRef(type.value, visited);
+    case "set":
+      return containsRef(type.element, visited);
     default:
       return false;
   }
@@ -2434,7 +2490,7 @@ function generateSchemaFileSource(sources, allTypes, helpersImportPath) {
     if (!typeInfo) {
       continue;
     }
-    const coerce = /(?:Query|Params)$/.test(schemaName);
+    const coerce = source.coerce ?? /(?:Query|Params)$/.test(schemaName);
     const block = [`// ${schemaName}`];
     const schemaCode = generateZodSchemaSource(typeInfo, resolveType, schemaName, coerce).replace(
       /^import \{ z \} from 'zod';\s*\n\s*\n/,
@@ -2446,7 +2502,9 @@ function generateSchemaFileSource(sources, allTypes, helpersImportPath) {
   }
   const allSchemaCode = schemaBlocks.join("\n");
   if (helpersImportPath && usesCoerceHelpers(allSchemaCode)) {
-    lines.push(`import { coerceNumber, coerceBoolean } from '${helpersImportPath}';`);
+    lines.push(
+      `import { coerceNumber, coerceBoolean, coerceMap, coerceSet } from '${helpersImportPath}';`
+    );
   }
   lines.push("");
   lines.push(...schemaBlocks);
@@ -2567,6 +2625,7 @@ function createServer(options) {
     middlewares: globalMiddlewares,
     injectors: globalInjectors,
     helmet: helmetOption,
+    logger: loggerOption,
     bodyLimit = DEFAULT_BODY_LIMIT,
     http2: http2Option
   } = options;
@@ -2578,6 +2637,8 @@ function createServer(options) {
     const helmOpts = typeof helmetOption === "object" ? helmetOption : {};
     configMiddlewares.push(helmet(helmOpts));
   }
+  const loggerMiddlewareInst = loggerOption === false ? null : loggerOption === true || loggerOption === void 0 ? logger() : logger(loggerOption);
+  if (loggerMiddlewareInst) configMiddlewares.push(loggerMiddlewareInst);
   const server = (() => {
     if (http2Option) {
       const h2Opts = typeof http2Option === "object" ? http2Option : {};
@@ -2883,7 +2944,7 @@ function isFaapiConfigKey(key) {
 }
 async function createAppBase(options) {
   const rootDir = options?.rootDir ?? process.cwd();
-  const outDir = process.env.FAAPI_OUT_DIR ?? DEFAULT_OUT_DIR;
+  const outDir = options?.outDir ?? process.env.FAAPI_OUT_DIR ?? DEFAULT_OUT_DIR;
   const routesPath = path7.resolve(rootDir, outDir, ROUTES_FILE);
   if (!fs4.existsSync(routesPath)) {
     throw new Error(
@@ -2919,6 +2980,7 @@ async function createAppBase(options) {
     middlewares: config?.middlewares,
     injectors: config?.injectors,
     helmet: config?.helmet,
+    logger: config?.logger,
     bodyLimit: config?.bodyLimit,
     http2: config?.http2
   });