@faapi/faapi 0.0.0-canary.2a7b6a3 → 0.0.0-canary.4e89b9b

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();
@@ -995,8 +1028,8 @@ async function importWithCacheBust(filePath) {
 
 // src/config/loadConfig.ts
 var CONFIG_PRODUCT_FILE = "faapi-config.js";
-async function loadConfig(rootDir, outDir) {
-  const configProductPath = path2.resolve(rootDir, outDir, CONFIG_PRODUCT_FILE);
+async function loadConfig(rootDir, dist) {
+  const configProductPath = path2.resolve(rootDir, dist, CONFIG_PRODUCT_FILE);
   if (fs.existsSync(configProductPath)) {
     const module = await importWithCacheBust(configProductPath);
     return module.default ?? {};
@@ -1004,7 +1037,7 @@ async function loadConfig(rootDir, outDir) {
   const hasSourceConfig = fs.existsSync(path2.join(rootDir, "faapi.config.ts")) || fs.existsSync(path2.join(rootDir, "faapi.config.js"));
   if (hasSourceConfig) {
     throw new Error(
-      `[faapi] ${outDir}/${CONFIG_PRODUCT_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
+      `[faapi] ${dist}/${CONFIG_PRODUCT_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
     );
   }
   return null;
@@ -1062,182 +1095,6 @@ var ModuleLoadError = class extends FaapiError {
   }
 };
 
-// src/cli/createAppCore.ts
-import fs4 from "fs";
-import path7 from "path";
-import { PassThrough } from "stream";
-
-// src/router/sortRoutes.ts
-function sortRoutes(routes) {
-  return [...routes].sort((a, b) => {
-    if (a.isDynamic !== b.isDynamic) {
-      return a.isDynamic ? 1 : -1;
-    }
-    if (a.isCatchAll !== b.isCatchAll) {
-      return a.isCatchAll ? 1 : -1;
-    }
-    const aSegments = a.urlPath.split("/").filter(Boolean).length;
-    const bSegments = b.urlPath.split("/").filter(Boolean).length;
-    if (aSegments !== bSegments) {
-      return aSegments - bSegments;
-    }
-    return a.urlPath.localeCompare(b.urlPath);
-  });
-}
-
-// src/router/detectRouteConflicts.ts
-function detectRouteConflicts(routes) {
-  const map = /* @__PURE__ */ new Map();
-  for (const route of routes) {
-    const key = `${route.method} ${route.urlPath}`;
-    const existing = map.get(key);
-    if (existing) {
-      existing.files.push(route.filePath);
-    } else {
-      map.set(key, {
-        method: route.method,
-        urlPath: route.urlPath,
-        files: [route.filePath]
-      });
-    }
-  }
-  const conflicts = [];
-  for (const conflict of map.values()) {
-    if (conflict.files.length > 1) {
-      conflicts.push(conflict);
-    }
-  }
-  return conflicts;
-}
-
-// src/server/createServer.ts
-import {
-  createServer as createHttpServer
-} from "http";
-import { createSecureServer as createHttp2SecureServer } from "http2";
-import { readFileSync } from "fs";
-import { Readable as Readable2 } from "stream";
-import path5 from "path";
-
-// src/router/matchRoute.ts
-function matchRoute(routes, method, path9) {
-  for (const route of routes) {
-    if (route.method !== method) {
-      continue;
-    }
-    if (!route.isDynamic) {
-      if (route.urlPath === path9) {
-        return { route, params: {} };
-      }
-      continue;
-    }
-    const params = matchDynamicPath(route.urlPath, path9, route.paramNames, route.isCatchAll);
-    if (params !== null) {
-      return { route, params };
-    }
-  }
-  return null;
-}
-function matchWsRoute(wsRoutes, path9) {
-  for (const route of wsRoutes) {
-    if (!route.isDynamic) {
-      if (route.urlPath === path9) {
-        return { route, params: {} };
-      }
-      continue;
-    }
-    const params = matchDynamicPath(route.urlPath, path9, route.paramNames, route.isCatchAll);
-    if (params !== null) {
-      return { route, params };
-    }
-  }
-  return null;
-}
-function matchDynamicPath(pattern, path9, paramNames, isCatchAll) {
-  const patternSegments = pattern.split("/").filter(Boolean);
-  const pathSegments = path9.split("/").filter(Boolean);
-  if (isCatchAll) {
-    const nonCatchAllCount = patternSegments.length - 1;
-    if (pathSegments.length <= nonCatchAllCount) {
-      return null;
-    }
-    const params2 = {};
-    for (let i = 0; i < nonCatchAllCount; i++) {
-      const patternSeg = patternSegments[i];
-      const pathSeg = pathSegments[i];
-      if (patternSeg.startsWith(":")) {
-        const paramName = patternSeg.slice(1);
-        params2[paramName] = pathSeg;
-      } else if (patternSeg !== pathSeg) {
-        return null;
-      }
-    }
-    const catchAllValue = pathSegments.slice(nonCatchAllCount).join("/");
-    const catchAllParamName = patternSegments[nonCatchAllCount].slice(4);
-    params2[catchAllParamName] = catchAllValue;
-    if (Object.keys(params2).length !== paramNames.length) {
-      return null;
-    }
-    return params2;
-  }
-  if (patternSegments.length !== pathSegments.length) {
-    return null;
-  }
-  const params = {};
-  for (let i = 0; i < patternSegments.length; i++) {
-    const patternSeg = patternSegments[i];
-    const pathSeg = pathSegments[i];
-    if (patternSeg.startsWith(":")) {
-      const paramName = patternSeg.slice(1);
-      params[paramName] = pathSeg;
-    } else if (patternSeg !== pathSeg) {
-      return null;
-    }
-  }
-  if (Object.keys(params).length !== paramNames.length) {
-    return null;
-  }
-  return params;
-}
-
-// src/loader/resolveExports.ts
-function resolveExport(module, exportName) {
-  if (exportName in module && typeof module[exportName] !== "undefined") {
-    return module[exportName];
-  }
-  const defaultExport = module.default;
-  if (defaultExport !== null && typeof defaultExport === "object") {
-    const value = defaultExport[exportName];
-    if (value !== void 0) {
-      return value;
-    }
-  }
-  return void 0;
-}
-
-// src/loader/validateRouteModule.ts
-function validateRouteModule(value, method, filePath) {
-  if (typeof value !== "function") {
-    throw new Error(
-      `Route module "${filePath}" does not export a valid handler for method "${method}". Expected a function, got ${typeof value}.`
-    );
-  }
-}
-
-// src/loader/loadRouteModule.ts
-async function loadRouteModule(filePath, method) {
-  let module;
-  try {
-    module = await importWithCacheBust(filePath);
-  } catch (err) {
-    const reason = err instanceof Error ? err.message : String(err);
-    throw new Error(`Failed to load route module "${filePath}": ${reason}`, { cause: err });
-  }
-  const handler = resolveExport(module, method);
-  validateRouteModule(handler, method, filePath);
-  return { handler, method };
-}
-
 // src/runtime/sse.ts
 function encodeSseEvent(event) {
   let out = "";
@@ -1442,111 +1299,22 @@ function createContext(request, params, config = {}, ip = "") {
   return ctx;
 }
 
-// src/utils/queryToObject.ts
-function queryToObject(params) {
-  const result = {};
-  for (const [key, value] of params) {
-    result[key] = value;
+// src/utils/isPlainObject.ts
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") {
+    return false;
   }
-  return result;
-}
-
-// src/utils/parseJsonBody.ts
-function parseJsonBody(text) {
-  try {
-    const data = JSON.parse(text);
-    return { success: true, data };
-  } catch {
-    return { success: false, error: "Invalid JSON body" };
+  if (Array.isArray(value)) {
+    return false;
   }
+  const proto = Object.getPrototypeOf(value);
+  return proto === null || proto === Object.prototype;
 }
 
-// src/utils/parseMultipart.ts
-async function parseMultipart(request) {
-  const formData = await request.formData();
-  const fields = {};
-  const files = [];
-  for (const [key, value] of formData.entries()) {
-    if (value instanceof File) {
-      files.push({
-        name: key,
-        filename: value.name,
-        type: value.type,
-        size: value.size,
-        arrayBuffer: () => value.arrayBuffer()
-      });
-    } else {
-      if (key in fields) {
-        const existing = fields[key];
-        if (Array.isArray(existing)) {
-          existing.push(value);
-        } else {
-          fields[key] = [existing, value];
-        }
-      } else {
-        fields[key] = value;
-      }
-    }
-  }
-  return { fields, files };
-}
-
-// src/runtime/resolveInput.ts
-async function resolveInput(method, request) {
-  const inputType = getInputTypeForMethod(method);
-  if (inputType === "body") {
-    const contentType = request.headers.get("content-type") ?? "";
-    if (contentType.includes("multipart/form-data")) {
-      return parseMultipart(request);
-    }
-    if (contentType.includes("application/x-www-form-urlencoded")) {
-      const text2 = await request.text();
-      if (text2.trim() === "") return null;
-      const params = new URLSearchParams(text2);
-      const obj = {};
-      for (const [key, value] of params) {
-        obj[key] = value;
-      }
-      return obj;
-    }
-    const text = await request.text();
-    if (text.trim() === "") {
-      return null;
-    }
-    const result = parseJsonBody(text);
-    if (!result.success) {
-      throw new ValidationError("\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON", [
-        {
-          path: "body",
-          code: "INVALID_FORMAT",
-          expected: "JSON",
-          received: "text",
-          message: "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON"
-        }
-      ]);
-    }
-    return result.data;
-  }
-  const url = new URL(request.url);
-  return queryToObject(url.searchParams);
-}
-
-// src/utils/isPlainObject.ts
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  if (Array.isArray(value)) {
-    return false;
-  }
-  const proto = Object.getPrototypeOf(value);
-  return proto === null || proto === Object.prototype;
-}
-
-// src/response/toResponse.ts
-async function toResponse(value, meta) {
-  if (value instanceof Promise) {
-    return toResponse(await value, meta);
+// src/response/toResponse.ts
+async function toResponse(value, meta) {
+  if (value instanceof Promise) {
+    return toResponse(await value, meta);
   }
   const applyMeta = (headers2) => {
     if (!meta) return;
@@ -1632,6 +1400,15 @@ async function toResponse(value, meta) {
   });
 }
 
+// src/utils/queryToObject.ts
+function queryToObject(params) {
+  const result = {};
+  for (const [key, value] of params) {
+    result[key] = value;
+  }
+  return result;
+}
+
 // src/injection/injectParams.ts
 function getBuiltinInjectionValue(type, ctx, body) {
   switch (type) {
@@ -1649,6 +1426,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;
@@ -1767,6 +1548,262 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
   return await compose(middlewares, ctx, finalHandler);
 }
 
+// src/cli/createAppCore.ts
+import fs4 from "fs";
+import path7 from "path";
+import { PassThrough } from "stream";
+
+// src/router/sortRoutes.ts
+function sortRoutes(routes) {
+  return [...routes].sort((a, b) => {
+    if (a.isDynamic !== b.isDynamic) {
+      return a.isDynamic ? 1 : -1;
+    }
+    if (a.isCatchAll !== b.isCatchAll) {
+      return a.isCatchAll ? 1 : -1;
+    }
+    const aSegments = a.urlPath.split("/").filter(Boolean).length;
+    const bSegments = b.urlPath.split("/").filter(Boolean).length;
+    if (aSegments !== bSegments) {
+      return aSegments - bSegments;
+    }
+    return a.urlPath.localeCompare(b.urlPath);
+  });
+}
+
+// src/router/detectRouteConflicts.ts
+function detectRouteConflicts(routes) {
+  const map = /* @__PURE__ */ new Map();
+  for (const route of routes) {
+    const key = `${route.method} ${route.urlPath}`;
+    const existing = map.get(key);
+    if (existing) {
+      existing.files.push(route.filePath);
+    } else {
+      map.set(key, {
+        method: route.method,
+        urlPath: route.urlPath,
+        files: [route.filePath]
+      });
+    }
+  }
+  const conflicts = [];
+  for (const conflict of map.values()) {
+    if (conflict.files.length > 1) {
+      conflicts.push(conflict);
+    }
+  }
+  return conflicts;
+}
+
+// src/server/createServer.ts
+import {
+  createServer as createHttpServer
+} from "http";
+import { createSecureServer as createHttp2SecureServer } from "http2";
+import { readFileSync } from "fs";
+import { Readable as Readable2 } from "stream";
+import path5 from "path";
+
+// src/router/matchRoute.ts
+function matchRoute(routes, method, path9) {
+  for (const route of routes) {
+    if (route.method !== method) {
+      continue;
+    }
+    if (!route.isDynamic) {
+      if (route.urlPath === path9) {
+        return { route, params: {} };
+      }
+      continue;
+    }
+    const params = matchDynamicPath(route.urlPath, path9, route.paramNames, route.isCatchAll);
+    if (params !== null) {
+      return { route, params };
+    }
+  }
+  return null;
+}
+function matchWsRoute(wsRoutes, path9) {
+  for (const route of wsRoutes) {
+    if (!route.isDynamic) {
+      if (route.urlPath === path9) {
+        return { route, params: {} };
+      }
+      continue;
+    }
+    const params = matchDynamicPath(route.urlPath, path9, route.paramNames, route.isCatchAll);
+    if (params !== null) {
+      return { route, params };
+    }
+  }
+  return null;
+}
+function matchDynamicPath(pattern, path9, paramNames, isCatchAll) {
+  const patternSegments = pattern.split("/").filter(Boolean);
+  const pathSegments = path9.split("/").filter(Boolean);
+  if (isCatchAll) {
+    const nonCatchAllCount = patternSegments.length - 1;
+    if (pathSegments.length <= nonCatchAllCount) {
+      return null;
+    }
+    const params2 = {};
+    for (let i = 0; i < nonCatchAllCount; i++) {
+      const patternSeg = patternSegments[i];
+      const pathSeg = pathSegments[i];
+      if (patternSeg.startsWith(":")) {
+        const paramName = patternSeg.slice(1);
+        params2[paramName] = pathSeg;
+      } else if (patternSeg !== pathSeg) {
+        return null;
+      }
+    }
+    const catchAllValue = pathSegments.slice(nonCatchAllCount).join("/");
+    const catchAllParamName = patternSegments[nonCatchAllCount].slice(4);
+    params2[catchAllParamName] = catchAllValue;
+    if (Object.keys(params2).length !== paramNames.length) {
+      return null;
+    }
+    return params2;
+  }
+  if (patternSegments.length !== pathSegments.length) {
+    return null;
+  }
+  const params = {};
+  for (let i = 0; i < patternSegments.length; i++) {
+    const patternSeg = patternSegments[i];
+    const pathSeg = pathSegments[i];
+    if (patternSeg.startsWith(":")) {
+      const paramName = patternSeg.slice(1);
+      params[paramName] = pathSeg;
+    } else if (patternSeg !== pathSeg) {
+      return null;
+    }
+  }
+  if (Object.keys(params).length !== paramNames.length) {
+    return null;
+  }
+  return params;
+}
+
+// src/loader/resolveExports.ts
+function resolveExport(module, exportName) {
+  if (exportName in module && typeof module[exportName] !== "undefined") {
+    return module[exportName];
+  }
+  const defaultExport = module.default;
+  if (defaultExport !== null && typeof defaultExport === "object") {
+    const value = defaultExport[exportName];
+    if (value !== void 0) {
+      return value;
+    }
+  }
+  return void 0;
+}
+
+// src/loader/validateRouteModule.ts
+function validateRouteModule(value, method, filePath) {
+  if (typeof value !== "function") {
+    throw new Error(
+      `Route module "${filePath}" does not export a valid handler for method "${method}". Expected a function, got ${typeof value}.`
+    );
+  }
+}
+
+// src/loader/loadRouteModule.ts
+async function loadRouteModule(filePath, method) {
+  let module;
+  try {
+    module = await importWithCacheBust(filePath);
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    throw new Error(`Failed to load route module "${filePath}": ${reason}`, { cause: err });
+  }
+  const handler = resolveExport(module, method);
+  validateRouteModule(handler, method, filePath);
+  return { handler, method };
+}
+
+// src/utils/parseJsonBody.ts
+function parseJsonBody(text) {
+  try {
+    const data = JSON.parse(text);
+    return { success: true, data };
+  } catch {
+    return { success: false, error: "Invalid JSON body" };
+  }
+}
+
+// src/utils/parseMultipart.ts
+async function parseMultipart(request) {
+  const formData = await request.formData();
+  const fields = {};
+  const files = [];
+  for (const [key, value] of formData.entries()) {
+    if (value instanceof File) {
+      files.push({
+        name: key,
+        filename: value.name,
+        type: value.type,
+        size: value.size,
+        arrayBuffer: () => value.arrayBuffer()
+      });
+    } else {
+      if (key in fields) {
+        const existing = fields[key];
+        if (Array.isArray(existing)) {
+          existing.push(value);
+        } else {
+          fields[key] = [existing, value];
+        }
+      } else {
+        fields[key] = value;
+      }
+    }
+  }
+  return { fields, files };
+}
+
+// src/runtime/resolveInput.ts
+async function resolveInput(method, request) {
+  const inputType = getInputTypeForMethod(method);
+  if (inputType === "body") {
+    const contentType = request.headers.get("content-type") ?? "";
+    if (contentType.includes("multipart/form-data")) {
+      return parseMultipart(request);
+    }
+    if (contentType.includes("application/x-www-form-urlencoded")) {
+      const text2 = await request.text();
+      if (text2.trim() === "") return null;
+      const params = new URLSearchParams(text2);
+      const obj = {};
+      for (const [key, value] of params) {
+        obj[key] = value;
+      }
+      return obj;
+    }
+    const text = await request.text();
+    if (text.trim() === "") {
+      return null;
+    }
+    const result = parseJsonBody(text);
+    if (!result.success) {
+      throw new ValidationError("\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON", [
+        {
+          path: "body",
+          code: "INVALID_FORMAT",
+          expected: "JSON",
+          received: "text",
+          message: "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON"
+        }
+      ]);
+    }
+    return result.data;
+  }
+  const url = new URL(request.url);
+  return queryToObject(url.searchParams);
+}
+
 // src/response/sendNodeResponse.ts
 import { Readable } from "stream";
 async function sendNodeResponse(response, res) {
@@ -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;
   }
@@ -2400,25 +2456,25 @@ function generateZodSchemaSource(typeInfo, resolveType, exportName, coerce = fal
 }
 
 // src/cli/generateSchemaFiles.ts
-function getSchemaOutputPath(sourceFile, appDir, outDir, rootDir) {
+function getSchemaOutputPath(sourceFile, dist, rootDir) {
   let rel = sourceFile.replace(/\\/g, "/");
-  if (appDir !== "." && rel.startsWith(`${appDir}/`)) {
-    rel = rel.slice(appDir.length + 1);
+  if (rel.startsWith("src/")) {
+    rel = rel.slice(4);
   }
   const idx = rel.lastIndexOf("/");
   const relDir = idx >= 0 ? rel.slice(0, idx) : "";
-  return path4.resolve(rootDir, outDir, relDir, "zod.js");
+  return path4.resolve(rootDir, dist, relDir, "zod.js");
 }
-function getRuntimeSchemaPath(filePath, appDir, outDir, rootDir) {
+function getRuntimeSchemaPath(filePath, dist, rootDir) {
   let rel = filePath.replace(/\\/g, "/");
-  if (appDir !== "." && rel.startsWith(`${appDir}/`)) {
-    rel = rel.slice(appDir.length + 1);
-  } else if (rel.startsWith(`${outDir}/`)) {
-    rel = rel.slice(outDir.length + 1);
+  if (rel.startsWith("src/")) {
+    rel = rel.slice(4);
+  } else if (rel.startsWith(`${dist}/`)) {
+    rel = rel.slice(dist.length + 1);
   }
   const idx = rel.lastIndexOf("/");
   const relDir = idx >= 0 ? rel.slice(0, idx) : "";
-  return path4.resolve(rootDir, outDir, relDir, "zod.js");
+  return path4.resolve(rootDir, dist, relDir, "zod.js");
 }
 function getHelpersImportPath(relDir) {
   if (!relDir) return `./${HELPERS_FILENAME}`;
@@ -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,13 +2502,15 @@ 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);
   return lines.join("\n").replace(/\n+$/, "\n");
 }
-async function generateSchemaFiles(routes, rootDir, appDir, outDir) {
+async function generateSchemaFiles(routes, rootDir, dist) {
   if (routes.length === 0) return;
   const { sources, allTypesByFile } = collectRouteSchemaSources(routes, rootDir);
   const sourcesByFile = /* @__PURE__ */ new Map();
@@ -2467,11 +2525,11 @@ async function generateSchemaFiles(routes, rootDir, appDir, outDir) {
   const fileEntries = [];
   for (const [filePath, fileSources] of sourcesByFile) {
     const relFile = path4.relative(rootDir, filePath).replace(/\\/g, "/");
-    const outputPath = getSchemaOutputPath(relFile, appDir, outDir, rootDir);
+    const outputPath = getSchemaOutputPath(relFile, dist, rootDir);
     const allTypes = allTypesByFile.get(filePath) ?? /* @__PURE__ */ new Map();
     let relForDir = relFile;
-    if (appDir !== "." && relForDir.startsWith(`${appDir}/`)) {
-      relForDir = relForDir.slice(appDir.length + 1);
+    if (relForDir.startsWith("src/")) {
+      relForDir = relForDir.slice(4);
     }
     const dirIdx = relForDir.lastIndexOf("/");
     const zodRelDir = dirIdx >= 0 ? relForDir.slice(0, dirIdx) : "";
@@ -2481,7 +2539,7 @@ async function generateSchemaFiles(routes, rootDir, appDir, outDir) {
   }
   const allSourceCode = fileEntries.map((e) => e.source).join("\n");
   if (usesCoerceHelpers(allSourceCode)) {
-    const helpersPath = path4.resolve(rootDir, outDir, HELPERS_FILENAME);
+    const helpersPath = path4.resolve(rootDir, dist, HELPERS_FILENAME);
     await writeSchemaFile(helpersPath, generateHelpersFileSource());
   }
   await Promise.all(
@@ -2558,8 +2616,7 @@ function createServer(options) {
   const {
     routes,
     rootDir,
-    appDir,
-    outDir,
+    dist,
     cors: corsOption,
     onError,
     config,
@@ -2567,6 +2624,7 @@ function createServer(options) {
     middlewares: globalMiddlewares,
     injectors: globalInjectors,
     helmet: helmetOption,
+    logger: loggerOption,
     bodyLimit = DEFAULT_BODY_LIMIT,
     http2: http2Option
   } = options;
@@ -2578,6 +2636,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 : {};
@@ -2594,8 +2654,7 @@ function createServer(options) {
     handleRequest(
       currentRoutes,
       rootDir,
-      appDir,
-      outDir,
+      dist,
       req,
       res,
       configMiddlewares,
@@ -2614,7 +2673,7 @@ function createServer(options) {
   }
   return { server, routesRef };
 }
-async function handleRequest(routes, rootDir, appDir, outDir, req, res, configMiddlewares, onError, config, globalMiddlewares, globalInjectors, bodyLimit) {
+async function handleRequest(routes, rootDir, dist, req, res, configMiddlewares, onError, config, globalMiddlewares, globalInjectors, bodyLimit) {
   const request = toWebRequest(req, bodyLimit);
   const method = request.method.toUpperCase();
   const urlPath = new URL(request.url).pathname;
@@ -2635,7 +2694,7 @@ async function handleRequest(routes, rootDir, appDir, outDir, req, res, configMi
     const routeModule = await loadRouteModule(absoluteFilePath, route.method);
     const input = await resolveInput(route.method, request);
     const inputType = getInputTypeForMethod(route.method);
-    const schemaPath = getRuntimeSchemaPath(route.filePath, appDir, outDir, rootDir);
+    const schemaPath = getRuntimeSchemaPath(route.filePath, dist, rootDir);
     const result = await validateInput(schemaPath, route.method, inputType, input);
     if (!result.valid) {
       throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", result.issues);
@@ -2862,10 +2921,10 @@ function resolveDeclaration(decl) {
 }
 
 // src/cli/createAppCore.ts
-var DEFAULT_OUT_DIR = "dist";
-var DEFAULT_APP_DIR = "src";
+var DEFAULT_DIST = "dist";
 var DEFAULT_PORT = 3e3;
 var ROUTES_FILE = "faapi-routes.js";
+var PATTERNS = ["src/api/**/*.ts"];
 var FAAPI_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "cors",
   "lifecycle",
@@ -2883,16 +2942,14 @@ function isFaapiConfigKey(key) {
 }
 async function createAppBase(options) {
   const rootDir = options?.rootDir ?? process.cwd();
-  const outDir = process.env.FAAPI_OUT_DIR ?? DEFAULT_OUT_DIR;
-  const routesPath = path7.resolve(rootDir, outDir, ROUTES_FILE);
+  const dist = options?.dist ?? process.env.FAAPI_DIST ?? DEFAULT_DIST;
+  const routesPath = path7.resolve(rootDir, dist, ROUTES_FILE);
   if (!fs4.existsSync(routesPath)) {
     throw new Error(
-      `[faapi] ${outDir}/${ROUTES_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
+      `[faapi] ${dist}/${ROUTES_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
     );
   }
-  const config = await loadConfig(rootDir, outDir);
-  const appDir = options?.appDir ?? process.env.FAAPI_APP_DIR ?? DEFAULT_APP_DIR;
-  const patterns = appDir === "." ? ["api/**/*.ts"] : [`${appDir}/api/**/*.ts`];
+  const config = await loadConfig(rootDir, dist);
   const serialized = await importWithCacheBust(routesPath);
   const hydrated = await hydrateRoutes(serialized);
   let sorted = sortRoutes(hydrated.routes);
@@ -2910,8 +2967,7 @@ async function createAppBase(options) {
   const { server, routesRef } = createServer({
     routes: sorted,
     rootDir,
-    appDir,
-    outDir,
+    dist,
     cors: config?.cors ?? true,
     onError: config?.lifecycle?.onError,
     config: config ?? void 0,
@@ -2919,6 +2975,7 @@ async function createAppBase(options) {
     middlewares: config?.middlewares,
     injectors: config?.injectors,
     helmet: config?.helmet,
+    logger: config?.logger,
     bodyLimit: config?.bodyLimit,
     http2: config?.http2
   });
@@ -3071,9 +3128,8 @@ async function createAppBase(options) {
   };
   const ctx = {
     rootDir,
-    appDir,
-    outDir,
-    patterns,
+    dist,
+    patterns: PATTERNS,
     server,
     routesRef,
     config,
@@ -3139,8 +3195,8 @@ function isCatchAllSegment(segment) {
 function isRouteGroup(segment) {
   return /^\(.+\)$/.test(segment);
 }
-function filePathToUrlPath(filePath, appDir = ".") {
-  const withoutPrefix = filePath.startsWith(appDir + "/") ? filePath.slice(appDir.length + 1) : filePath;
+function filePathToUrlPath(filePath) {
+  const withoutPrefix = filePath.startsWith("src/") ? filePath.slice(4) : filePath;
   const lastSlashIndex = withoutPrefix.lastIndexOf("/");
   const dirPath = lastSlashIndex === -1 ? "" : withoutPrefix.slice(0, lastSlashIndex);
   if (!dirPath) {
@@ -3151,24 +3207,25 @@ function filePathToUrlPath(filePath, appDir = ".") {
 }
 
 // src/router/scanRoutes.ts
-function toProdAbsPath(sourceAbsPath, rootDir, appDir, prodDir) {
+var APP_DIR = "src";
+function toProdAbsPath(sourceAbsPath, rootDir, dist) {
   let rel = path8.relative(rootDir, sourceAbsPath).replace(/\\/g, "/");
-  if (appDir !== "." && rel.startsWith(`${appDir}/`)) {
-    rel = rel.slice(appDir.length + 1);
+  if (rel.startsWith(`${APP_DIR}/`)) {
+    rel = rel.slice(APP_DIR.length + 1);
   }
-  const prodRel = `${prodDir}/${rel.replace(/\.ts$/, ".js")}`;
+  const prodRel = `${dist}/${rel.replace(/\.ts$/, ".js")}`;
   return path8.resolve(rootDir, prodRel);
 }
-async function findMergedMiddlewares(routeFilePath, rootDir, appDir, prodDir) {
+async function findMergedMiddlewares(routeFilePath, rootDir, dist) {
   const routeDir = path8.dirname(routeFilePath);
   const resolvedRoot = path8.resolve(rootDir);
   const mwPaths = [];
   let currentDir = path8.resolve(rootDir, routeDir);
   while (true) {
-    if (prodDir) {
+    if (dist) {
       const mwPath = path8.join(currentDir, "middlewares.js");
       const absMwPath = path8.resolve(rootDir, mwPath);
-      const prodAbsMwPath = toProdAbsPath(absMwPath, rootDir, appDir, prodDir);
+      const prodAbsMwPath = toProdAbsPath(absMwPath, rootDir, dist);
       if (fs5.existsSync(prodAbsMwPath)) {
         mwPaths.push(prodAbsMwPath);
       }
@@ -3233,8 +3290,7 @@ async function hasWsExport(absPath) {
     return false;
   }
 }
-async function scanRoutes(rootDir, patterns, appDir, prodDir) {
-  const dir = appDir ?? ".";
+async function scanRoutes(rootDir, patterns, dist) {
   const files = await fg(patterns, {
     cwd: rootDir,
     onlyFiles: true,
@@ -3247,12 +3303,12 @@ async function scanRoutes(rootDir, patterns, appDir, prodDir) {
     const fileName = normalizedFile.split("/").pop();
     if (fileName === "handler.ts" || fileName === "handler.js") {
       const absPath = path8.resolve(rootDir, normalizedFile);
-      const importPath = prodDir ? toProdAbsPath(absPath, rootDir, dir, prodDir) : absPath;
-      const urlPath = filePathToUrlPath(normalizedFile, dir);
+      const importPath = dist ? toProdAbsPath(absPath, rootDir, dist) : absPath;
+      const urlPath = filePathToUrlPath(normalizedFile);
       const paramNames = extractParamNames(urlPath);
       const isDynamic = paramNames.length > 0;
       const isCatchAll = normalizedFile.split("/").some(isCatchAllSegment);
-      const middlewareBundle = await findMergedMiddlewares(normalizedFile, rootDir, dir, prodDir);
+      const middlewareBundle = await findMergedMiddlewares(normalizedFile, rootDir, dist);
       const methods = await extractMethodsFromHandler(importPath);
       for (const method of methods) {
         routes.push({
@@ -3293,9 +3349,9 @@ async function createDevApp(options) {
     invalidateMiddlewareCache();
     invalidateProgramCache();
     invalidateSchemaCache();
-    const reScanned = await scanRoutes(ctx.rootDir, ctx.patterns, ctx.appDir, ctx.outDir);
+    const reScanned = await scanRoutes(ctx.rootDir, ctx.patterns, ctx.dist);
     const sorted = sortRoutes(reScanned.routes);
-    await generateSchemaFiles(sorted, ctx.rootDir, ctx.appDir, ctx.outDir);
+    await generateSchemaFiles(sorted, ctx.rootDir, ctx.dist);
     ctx.updateRoutes(sorted, reScanned.wsRoutes);
   };
   return devApp;
@@ -3317,6 +3373,7 @@ export {
   collectRouteSchemaSources,
   cors,
   createProdApp as createApp,
+  createContext,
   createDevApp,
   createProdApp,
   createProgram,
@@ -3324,6 +3381,7 @@ export {
   getInputTypeForMethod,
   helmet,
   invalidateProgramCache,
+  invokeHandler,
   loadConfig,
   logger,
   resolveTypeNode