@faapi/faapi 0.0.0-canary.9a79cdf → 0.0.0-canary.b2b338c

package/dist/index.d.ts

@@ -563,9 +563,8 @@ interface LifecycleContext {
  * 环境覆盖通过 faapi.config.{NODE_ENV}.ts 实现（如 faapi.config.production.ts）
  *
  * 框架元信息通过环境变量配置（不放在 config 内）：
- * - `FAAPI_APP_DIR`：源码目录前缀，默认 'src'，设为 '.' 表示源码在项目根目录
  * - `PORT`：服务端口，默认 3000
- * - `FAAPI_OUT_DIR`：产物输出目录，dev 固定为 '.faapi/dev'，prod 默认 'dist'
+ * - `FAAPI_DIST`：产物输出目录，dev 固定为 `.faapi`（不可修改），prod 默认为 `dist`（可通过 `--dist` 修改）
  */
 interface FaapiConfig {
     /** CORS 配置，false 禁用 */
@@ -995,8 +994,8 @@ declare function collectRouteSchemaSources(routes: RouteManifest, rootDir?: stri
 /**
  * 加载 faapi 配置文件
  *
- * 统一读取 `<outDir>/faapi-config.js` 产物：
- * - dev 模式：`faapi dev` 启动时由 `compileConfig` 生成 `.faapi/dev/faapi-config.js`
+ * 统一读取 `<dist>/faapi-config.js` 产物：
+ * - dev 模式：`faapi dev` 启动时由 `compileConfig` 生成 `.faapi/faapi-config.js`
  * - prod 模式：`faapi build` 时由 `compileConfig` 生成 `dist/faapi-config.js`
  *
  * 产物由 `compileConfig` 在构建阶段合并 env 后固化，运行时不读源码、不现场编译、不按 env 合并。
@@ -1006,10 +1005,10 @@ declare function collectRouteSchemaSources(routes: RouteManifest, rootDir?: stri
  * - 源码也无配置文件 → 返回 `null`（配置可选）
  *
  * @param rootDir 项目根目录
- * @param outDir 产物目录（如 'dist' 或 '.faapi/dev'）
+ * @param dist 产物目录（如 'dist' 或 '.faapi'）
  * @returns 配置对象，无配置文件时返回 null
  */
-declare function loadConfig(rootDir: string, outDir: string): Promise<Partial<FaapiConfig> | null>;
+declare function loadConfig(rootDir: string, dist: string): Promise<Partial<FaapiConfig> | null>;
 
 declare const VALIDATION_ERROR = "VALIDATION_ERROR";
 declare const ROUTE_NOT_FOUND = "ROUTE_NOT_FOUND";
@@ -1080,10 +1079,8 @@ interface InjectResponse {
 interface CreateAppOptions {
     /** 项目根目录，默认 process.cwd() */
     rootDir?: string;
-    /** 源码目录前缀，覆盖环境变量 FAAPI_APP_DIR，默认 'src' */
-    appDir?: string;
-    /** 产物输出目录，覆盖环境变量 FAAPI_OUT_DIR，默认 'dist' */
-    outDir?: string;
+    /** 产物输出目录（如 dist 或 .faapi），覆盖环境变量 FAAPI_DIST，默认 'dist' */
+    dist?: string;
     /** 端口号，也可在 listen() 时传入；默认环境变量 PORT 或 3000 */
     port?: number;
 }
@@ -1131,7 +1128,7 @@ interface DevApp extends AppBase {
  * // devCommand 内部
  * const app = await createDevApp();
  * await app.listen();
- * startWatcher({ rootDir, appDir, app });
+ * startWatcher({ rootDir, app, devDist });
  * ```
  */
 declare function createDevApp(options?: CreateAppOptions): Promise<DevApp>;

package/dist/index.js

@@ -1028,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 ?? {};
@@ -1037,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;
@@ -2456,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}`;
@@ -2510,7 +2510,7 @@ function generateSchemaFileSource(sources, allTypes, helpersImportPath) {
   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();
@@ -2525,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) : "";
@@ -2539,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(
@@ -2616,8 +2616,7 @@ function createServer(options) {
   const {
     routes,
     rootDir,
-    appDir,
-    outDir,
+    dist,
     cors: corsOption,
     onError,
     config,
@@ -2655,8 +2654,7 @@ function createServer(options) {
     handleRequest(
       currentRoutes,
       rootDir,
-      appDir,
-      outDir,
+      dist,
       req,
       res,
       configMiddlewares,
@@ -2675,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;
@@ -2696,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);
@@ -2923,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",
@@ -2944,16 +2942,14 @@ function isFaapiConfigKey(key) {
 }
 async function createAppBase(options) {
   const rootDir = options?.rootDir ?? process.cwd();
-  const outDir = options?.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);
@@ -2971,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,
@@ -3133,9 +3128,8 @@ async function createAppBase(options) {
   };
   const ctx = {
     rootDir,
-    appDir,
-    outDir,
-    patterns,
+    dist,
+    patterns: PATTERNS,
     server,
     routesRef,
     config,
@@ -3201,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) {
@@ -3213,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);
       }
@@ -3295,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,
@@ -3309,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({
@@ -3355,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;