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

package/dist/cli/index.js

@@ -89,8 +89,8 @@ function isInsideDir(filePath, dir) {
   const rel = path2.relative(dir, filePath);
   return rel !== "" && !rel.startsWith("..") && !path2.isAbsolute(rel);
 }
-function toStrippedProdImportPath(sourceFile, rootDir, appDir) {
-  const appDirAbs = toRealPath(path2.resolve(rootDir, appDir));
+function toStrippedProdImportPath(sourceFile, rootDir) {
+  const appDirAbs = toRealPath(path2.resolve(rootDir, APP_DIR));
   const sourceReal = toRealPath(sourceFile);
   let rel = path2.relative(appDirAbs, sourceReal);
   rel = rel.split(path2.sep).join("/");
@@ -118,7 +118,7 @@ function resolveRelativeSpecifier(importer, specifier) {
 }
 function createAliasPlugin(config, options) {
   const SPEC_RE2 = /(\bfrom\s*|import\s*\(\s*)(['"])([^'"]+)\2/g;
-  const appDirAbs = options?.rootDir && options?.appDir ? toRealPath(path2.resolve(options.rootDir, options.appDir)) : null;
+  const appDirAbs = options?.rootDir ? toRealPath(path2.resolve(options.rootDir, APP_DIR)) : null;
   return {
     name: "faapi-alias",
     setup(build) {
@@ -146,8 +146,7 @@ function createAliasPlugin(config, options) {
                 modified = true;
                 return `${prefix}${quote}${toStrippedProdImportPath(
                   resolved,
-                  options.rootDir,
-                  options.appDir
+                  options.rootDir
                 )}${quote}`;
               }
               modified = true;
@@ -164,8 +163,7 @@ function createAliasPlugin(config, options) {
                 if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
                   return `${prefix}${quote}${toStrippedProdImportPath(
                     file,
-                    options.rootDir,
-                    options.appDir
+                    options.rootDir
                   )}${quote}`;
                 }
                 return `${prefix}${quote}${toProdImportPath(file, importer)}${quote}`;
@@ -178,8 +176,7 @@ function createAliasPlugin(config, options) {
                 if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
                   return `${prefix}${quote}${toStrippedProdImportPath(
                     file,
-                    options.rootDir,
-                    options.appDir
+                    options.rootDir
                   )}${quote}`;
                 }
                 return `${prefix}${quote}${toProdImportPath(file, importer)}${quote}`;
@@ -194,21 +191,17 @@ function createAliasPlugin(config, options) {
     }
   };
 }
-function buildAliasPlugins(rootDir, appDir) {
+function buildAliasPlugins(rootDir) {
   const tsconfig = readTsconfig(rootDir);
-  return [
-    createAliasPlugin(
-      tsconfig ?? { baseUrl: ".", paths: {} },
-      appDir ? { rootDir, appDir } : void 0
-    )
-  ];
+  return [createAliasPlugin(tsconfig ?? { baseUrl: ".", paths: {} }, { rootDir })];
 }
-var PROD_EXTS, SOURCE_EXTS, INDEX_EXTS;
+var APP_DIR, PROD_EXTS, SOURCE_EXTS, INDEX_EXTS;
 var init_aliasPlugin = __esm({
   "src/cli/aliasPlugin.ts"() {
     "use strict";
     init_resolveAlias();
     init_readTsconfig();
+    APP_DIR = "src";
     PROD_EXTS = [".js", ".mjs", ".cjs"];
     SOURCE_EXTS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
     INDEX_EXTS = [
@@ -227,8 +220,8 @@ import path3 from "path";
 import fs3 from "fs";
 import fg from "fast-glob";
 async function compileDevRoutes(options) {
-  const { rootDir, appDir, outDir, files, logLevel = "silent" } = options;
-  const entryPoints = files ?? await fg([`${appDir}/**/*.ts`], {
+  const { rootDir, dist, files, logLevel = "silent" } = options;
+  const entryPoints = files ?? await fg([`${APP_DIR2}/**/*.ts`], {
     cwd: rootDir,
     onlyFiles: true,
     absolute: true,
@@ -237,14 +230,14 @@ async function compileDevRoutes(options) {
   if (entryPoints.length === 0) {
     return { compiledFiles: [] };
   }
-  const absOutDir = path3.resolve(rootDir, outDir);
-  await fs3.promises.mkdir(absOutDir, { recursive: true });
+  const absDist = path3.resolve(rootDir, dist);
+  await fs3.promises.mkdir(absDist, { recursive: true });
   const plugins = buildAliasPlugins(rootDir);
   const esbuild = await import("esbuild");
-  const outbase = appDir === "." ? rootDir : path3.resolve(rootDir, appDir);
+  const outbase = path3.resolve(rootDir, APP_DIR2);
   await esbuild.build({
     entryPoints,
-    outdir: absOutDir,
+    outdir: absDist,
     outbase,
     bundle: false,
     platform: "node",
@@ -256,10 +249,12 @@ async function compileDevRoutes(options) {
   });
   return { compiledFiles: entryPoints };
 }
+var APP_DIR2;
 var init_compileDevRoutes = __esm({
   "src/cli/compileDevRoutes.ts"() {
     "use strict";
     init_aliasPlugin();
+    APP_DIR2 = "src";
   }
 });
 
@@ -347,8 +342,8 @@ function extractRelativeSpecifiers(source) {
   }
   return specifiers;
 }
-async function collectRelativeImports(entryFiles, rootDir, appDir) {
-  const appDirAbs = toRealPath2(path4.resolve(rootDir, appDir));
+async function collectRelativeImports(entryFiles, rootDir) {
+  const appDirAbs = toRealPath2(path4.resolve(rootDir, "src"));
   const visited = /* @__PURE__ */ new Set();
   const appDirFiles = /* @__PURE__ */ new Set();
   const nonAppDirFiles = /* @__PURE__ */ new Set();
@@ -394,30 +389,26 @@ function createExternalRelativePlugin() {
   };
 }
 async function compileConfig(options) {
-  const { rootDir, outDir, appDir = "src" } = options;
+  const { rootDir, dist } = options;
   const baseConfigName = findBaseConfig(rootDir);
   if (!baseConfigName) {
     return { generated: false, outputFile: "" };
   }
   const env = getEnv();
   const envConfigName = findEnvConfig(rootDir, env);
-  const absOutDir = path4.resolve(rootDir, outDir);
-  await fs4.promises.mkdir(absOutDir, { recursive: true });
+  const absDist = path4.resolve(rootDir, dist);
+  await fs4.promises.mkdir(absDist, { recursive: true });
   const configEntryPoints = [path4.resolve(rootDir, baseConfigName)];
   if (envConfigName) {
     configEntryPoints.push(path4.resolve(rootDir, envConfigName));
   }
-  const { appDirFiles, nonAppDirFiles } = await collectRelativeImports(
-    configEntryPoints,
-    rootDir,
-    appDir
-  );
+  const { appDirFiles, nonAppDirFiles } = await collectRelativeImports(configEntryPoints, rootDir);
   const esbuild = await import("esbuild");
-  const aliasPlugins = buildAliasPlugins(rootDir, appDir);
+  const aliasPlugins = buildAliasPlugins(rootDir);
   const step1aEntries = [...configEntryPoints, ...nonAppDirFiles];
   await esbuild.build({
     entryPoints: step1aEntries,
-    outdir: absOutDir,
+    outdir: absDist,
     outbase: rootDir,
     bundle: false,
     platform: "node",
@@ -428,10 +419,10 @@ async function compileConfig(options) {
     logLevel: "silent"
   });
   if (appDirFiles.length > 0) {
-    const appOutbase = appDir === "." ? rootDir : path4.resolve(rootDir, appDir);
+    const appOutbase = path4.resolve(rootDir, "src");
     await esbuild.build({
       entryPoints: appDirFiles,
-      outdir: absOutDir,
+      outdir: absDist,
       outbase: appOutbase,
       bundle: false,
       platform: "node",
@@ -453,9 +444,9 @@ async function compileConfig(options) {
     exportDefault = "export default base;";
   }
   const entryCode = [...imports, DEEP_MERGE_SOURCE, exportDefault].join("\n");
-  const outputFile = path4.resolve(absOutDir, "faapi-config.js");
+  const outputFile = path4.resolve(absDist, "faapi-config.js");
   await esbuild.build({
-    stdin: { contents: entryCode, resolveDir: absOutDir, loader: "ts" },
+    stdin: { contents: entryCode, resolveDir: absDist, loader: "ts" },
     outfile: outputFile,
     bundle: true,
     format: "esm",
@@ -1684,25 +1675,25 @@ var init_generateZodSchema = __esm({
 // src/cli/generateSchemaFiles.ts
 import path6 from "path";
 import fs5 from "fs/promises";
-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 path6.resolve(rootDir, outDir, relDir, "zod.js");
+  return path6.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 path6.resolve(rootDir, outDir, relDir, "zod.js");
+  return path6.resolve(rootDir, dist, relDir, "zod.js");
 }
 function getHelpersImportPath(relDir) {
   if (!relDir) return `./${HELPERS_FILENAME}`;
@@ -1738,7 +1729,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();
@@ -1753,11 +1744,11 @@ async function generateSchemaFiles(routes, rootDir, appDir, outDir) {
   const fileEntries = [];
   for (const [filePath, fileSources] of sourcesByFile) {
     const relFile = path6.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) : "";
@@ -1767,7 +1758,7 @@ async function generateSchemaFiles(routes, rootDir, appDir, outDir) {
   }
   const allSourceCode = fileEntries.map((e) => e.source).join("\n");
   if (usesCoerceHelpers(allSourceCode)) {
-    const helpersPath = path6.resolve(rootDir, outDir, HELPERS_FILENAME);
+    const helpersPath = path6.resolve(rootDir, dist, HELPERS_FILENAME);
     await writeSchemaFile(helpersPath, generateHelpersFileSource());
   }
   await Promise.all(
@@ -1860,20 +1851,20 @@ var init_loadMiddlewares = __esm({
 // src/cli/generateRoutes.ts
 import fs6 from "fs";
 import path7 from "path";
-function toProdFilePath(filePath, appDir, prodDir) {
+function toProdFilePath(filePath, dist) {
   let rel = filePath.replace(/\\/g, "/");
-  if (appDir !== "." && rel.startsWith(`${appDir}/`)) {
-    rel = rel.slice(appDir.length + 1);
+  if (rel.startsWith("src/")) {
+    rel = rel.slice(4);
   }
   const jsPath = rel.replace(/\.ts$/, ".js");
-  return jsPath.startsWith(`${prodDir}/`) ? jsPath : `${prodDir}/${jsPath}`;
+  return jsPath.startsWith(`${dist}/`) ? jsPath : `${dist}/${jsPath}`;
 }
-function serializeRoutes(routes, wsRoutes, rootDir, appDir = "src", prodDir = "dist") {
+function serializeRoutes(routes, wsRoutes, rootDir, dist = "dist") {
   const serialize = (route) => {
-    const middlewarePaths = extractMiddlewarePaths(route.filePath, rootDir, appDir, prodDir);
+    const middlewarePaths = extractMiddlewarePaths(route.filePath, rootDir, dist);
     const serialized = {
       urlPath: route.urlPath,
-      filePath: toProdFilePath(route.filePath, appDir, prodDir),
+      filePath: toProdFilePath(route.filePath, dist),
       paramNames: route.paramNames,
       isDynamic: route.isDynamic,
       isCatchAll: route.isCatchAll,
@@ -1889,7 +1880,7 @@ function serializeRoutes(routes, wsRoutes, rootDir, appDir = "src", prodDir = "d
     wsRoutes: wsRoutes.map(serialize)
   };
 }
-function extractMiddlewarePaths(routeFilePath, rootDir, appDir, prodDir) {
+function extractMiddlewarePaths(routeFilePath, rootDir, dist) {
   const routeDir = path7.dirname(routeFilePath);
   const resolvedRoot = path7.resolve(rootDir);
   const paths = [];
@@ -1902,7 +1893,7 @@ function extractMiddlewarePaths(routeFilePath, rootDir, appDir, prodDir) {
     const absMwPath = fs6.existsSync(absTsPath) ? absTsPath : fs6.existsSync(absJsPath) ? absJsPath : null;
     if (absMwPath) {
       const relMwPath = path7.relative(rootDir, absMwPath);
-      const prodAbsPath = path7.resolve(rootDir, toProdFilePath(relMwPath, appDir, prodDir));
+      const prodAbsPath = path7.resolve(rootDir, toProdFilePath(relMwPath, dist));
       paths.push(prodAbsPath);
     }
     if (currentDir === resolvedRoot) break;
@@ -2032,8 +2023,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) {
@@ -2053,24 +2044,24 @@ var init_parseRouteFile = __esm({
 import fg2 from "fast-glob";
 import path8 from "path";
 import fs7 from "fs";
-function toProdAbsPath(sourceAbsPath, rootDir, appDir, prodDir) {
+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_DIR3}/`)) {
+    rel = rel.slice(APP_DIR3.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 (fs7.existsSync(prodAbsMwPath)) {
         mwPaths.push(prodAbsMwPath);
       }
@@ -2135,8 +2126,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 fg2(patterns, {
     cwd: rootDir,
     onlyFiles: true,
@@ -2149,12 +2139,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({
@@ -2185,6 +2175,7 @@ async function scanRoutes(rootDir, patterns, appDir, prodDir) {
   }
   return { routes, wsRoutes };
 }
+var APP_DIR3;
 var init_scanRoutes = __esm({
   "src/router/scanRoutes.ts"() {
     "use strict";
@@ -2192,6 +2183,7 @@ var init_scanRoutes = __esm({
     init_parseRouteFile();
     init_loadMiddlewares();
     init_importWithCacheBust();
+    APP_DIR3 = "src";
   }
 });
 
@@ -2221,8 +2213,8 @@ var init_sortRoutes = __esm({
 // src/config/loadConfig.ts
 import path9 from "path";
 import fs8 from "fs";
-async function loadConfig(rootDir, outDir) {
-  const configProductPath = path9.resolve(rootDir, outDir, CONFIG_PRODUCT_FILE);
+async function loadConfig(rootDir, dist) {
+  const configProductPath = path9.resolve(rootDir, dist, CONFIG_PRODUCT_FILE);
   if (fs8.existsSync(configProductPath)) {
     const module = await importWithCacheBust(configProductPath);
     return module.default ?? {};
@@ -2230,7 +2222,7 @@ async function loadConfig(rootDir, outDir) {
   const hasSourceConfig = fs8.existsSync(path9.join(rootDir, "faapi.config.ts")) || fs8.existsSync(path9.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;
@@ -3956,7 +3948,7 @@ var init_esm2 = __esm({
 // src/cli/watcher.ts
 import path10 from "path";
 function startWatcher(options) {
-  const { rootDir, appDir, app } = options;
+  const { rootDir, app, devDist } = options;
   let rebuildTimer = null;
   let pendingFiles = /* @__PURE__ */ new Set();
   async function rebuildRoutes() {
@@ -3966,12 +3958,11 @@ function startWatcher(options) {
       if (filesToCompile.length > 0) {
         await compileDevRoutes({
           rootDir,
-          appDir,
-          outDir: DEV_OUT_DIR,
+          dist: devDist,
           files: filesToCompile
         });
       }
-      await compileConfig({ rootDir, outDir: DEV_OUT_DIR });
+      await compileConfig({ rootDir, dist: devDist });
       await app.reloadRoutes();
       const recompiledCount = filesToCompile.length;
       console.log(
@@ -3994,12 +3985,12 @@ function startWatcher(options) {
     "faapi.config.production.ts",
     "faapi.config.production.js"
   ];
-  const watchPaths = [appDir, ...CONFIG_FILES];
+  const watchPaths = ["src", ...CONFIG_FILES];
   const watcher = esm_default.watch(watchPaths, {
     cwd: rootDir,
     ignoreInitial: true,
     ignored: (filePath, stats) => {
-      if (filePath.includes("node_modules") || filePath.includes(".faapi") || filePath.includes("dist") || filePath.includes(".git")) {
+      if (filePath.includes("node_modules") || filePath.includes(".faapi") || filePath.includes(devDist) || filePath.includes(".git")) {
         return true;
       }
       if (!stats) return false;
@@ -4029,14 +4020,12 @@ function startWatcher(options) {
   });
   console.log("- Watch mode enabled");
 }
-var DEV_OUT_DIR;
 var init_watcher = __esm({
   "src/cli/watcher.ts"() {
     "use strict";
     init_esm2();
     init_compileDevRoutes();
     init_compileConfig();
-    DEV_OUT_DIR = ".faapi/dev";
   }
 });
 
@@ -5508,8 +5497,7 @@ function createServer(options) {
   const {
     routes,
     rootDir,
-    appDir,
-    outDir,
+    dist,
     cors: corsOption,
     onError,
     config,
@@ -5547,8 +5535,7 @@ function createServer(options) {
     handleRequest(
       currentRoutes,
       rootDir,
-      appDir,
-      outDir,
+      dist,
       req,
       res,
       configMiddlewares,
@@ -5567,7 +5554,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;
@@ -5588,7 +5575,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);
@@ -5758,16 +5745,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 = path13.resolve(rootDir, outDir, ROUTES_FILE);
+  const dist = options?.dist ?? process.env.FAAPI_DIST ?? DEFAULT_DIST;
+  const routesPath = path13.resolve(rootDir, dist, ROUTES_FILE);
   if (!fs9.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);
@@ -5785,8 +5770,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,
@@ -5947,9 +5931,8 @@ async function createAppBase(options) {
   };
   const ctx = {
     rootDir,
-    appDir,
-    outDir,
-    patterns,
+    dist,
+    patterns: PATTERNS,
     server,
     routesRef,
     config,
@@ -5964,7 +5947,7 @@ async function createAppBase(options) {
   };
   return { app, ctx };
 }
-var DEFAULT_OUT_DIR, DEFAULT_APP_DIR, DEFAULT_PORT, ROUTES_FILE, FAAPI_CONFIG_KEYS;
+var DEFAULT_DIST, DEFAULT_PORT, ROUTES_FILE, PATTERNS, FAAPI_CONFIG_KEYS;
 var init_createAppCore = __esm({
   "src/cli/createAppCore.ts"() {
     "use strict";
@@ -5976,10 +5959,10 @@ var init_createAppCore = __esm({
     init_generateRoutes();
     init_loadPlugins();
     init_importWithCacheBust();
-    DEFAULT_OUT_DIR = "dist";
-    DEFAULT_APP_DIR = "src";
+    DEFAULT_DIST = "dist";
     DEFAULT_PORT = 3e3;
     ROUTES_FILE = "faapi-routes.js";
+    PATTERNS = ["src/api/**/*.ts"];
     FAAPI_CONFIG_KEYS = /* @__PURE__ */ new Set([
       "cors",
       "lifecycle",
@@ -6004,9 +5987,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;
@@ -6034,32 +6017,31 @@ __export(devCommand_exports, {
 import path14 from "path";
 async function devCommand(options) {
   const rootDir = process.cwd();
-  process.env.FAAPI_OUT_DIR = DEV_OUT_DIR2;
+  const devDist = DEV_DIST;
+  process.env.FAAPI_DIST = devDist;
   if (!process.env.NODE_ENV) process.env.NODE_ENV = "development";
   console.log("- Development mode");
   console.log("- Compiling config...");
-  await compileConfig({ rootDir, outDir: DEV_OUT_DIR2 });
-  const _config = await loadConfig(rootDir, DEV_OUT_DIR2);
-  const appDir = options?.appDir ?? process.env.FAAPI_APP_DIR ?? "src";
-  const patterns = appDir === "." ? ["api/**/*.ts"] : [`${appDir}/api/**/*.ts`];
+  await compileConfig({ rootDir, dist: devDist });
+  const _config = await loadConfig(rootDir, devDist);
   console.log("- Compiling TypeScript...");
-  await compileDevRoutes({ rootDir, appDir, outDir: DEV_OUT_DIR2 });
+  await compileDevRoutes({ rootDir, dist: devDist });
   console.log("- Generating route manifest and schema...");
-  await generateRouteArtifacts(rootDir, appDir, patterns);
+  await generateRouteArtifacts(rootDir, PATTERNS2, devDist);
   console.log("- Starting dev app...");
   const app = await createDevApp({ rootDir, port: options?.port });
   await app.listen();
-  startWatcher({ rootDir, appDir, app });
+  startWatcher({ rootDir, app, devDist });
 }
-async function generateRouteArtifacts(rootDir, appDir, patterns) {
-  const { routes, wsRoutes } = await scanRoutes(rootDir, patterns, appDir, DEV_OUT_DIR2);
+async function generateRouteArtifacts(rootDir, patterns, dist) {
+  const { routes, wsRoutes } = await scanRoutes(rootDir, patterns, dist);
   const sorted = sortRoutes(routes);
-  const routesPath = path14.resolve(rootDir, DEV_OUT_DIR2, ROUTES_FILE2);
-  const serialized = serializeRoutes(sorted, wsRoutes, rootDir, appDir, DEV_OUT_DIR2);
+  const routesPath = path14.resolve(rootDir, dist, ROUTES_FILE2);
+  const serialized = serializeRoutes(sorted, wsRoutes, rootDir, dist);
   await writeRoutesModule(serialized, routesPath);
-  await generateSchemaFiles(sorted, rootDir, appDir, DEV_OUT_DIR2);
+  await generateSchemaFiles(sorted, rootDir, dist);
 }
-var DEV_OUT_DIR2, ROUTES_FILE2;
+var DEV_DIST, ROUTES_FILE2, PATTERNS2;
 var init_devCommand = __esm({
   "src/cli/devCommand.ts"() {
     "use strict";
@@ -6072,8 +6054,9 @@ var init_devCommand = __esm({
     init_loadConfig();
     init_watcher();
     init_createDevApp();
-    DEV_OUT_DIR2 = ".faapi/dev";
+    DEV_DIST = ".faapi";
     ROUTES_FILE2 = "faapi-routes.js";
+    PATTERNS2 = ["src/api/**/*.ts"];
   }
 });
 
@@ -6082,8 +6065,8 @@ import path15 from "path";
 import fs10 from "fs";
 import fg3 from "fast-glob";
 async function compileBuildRoutes(options) {
-  const { rootDir, appDir, outDir, files, logLevel = "silent" } = options;
-  const entryPoints = files ?? await fg3([`${appDir}/**/*.ts`], {
+  const { rootDir, dist, files, logLevel = "silent" } = options;
+  const entryPoints = files ?? await fg3([`${APP_DIR4}/**/*.ts`], {
     cwd: rootDir,
     onlyFiles: true,
     absolute: true,
@@ -6092,14 +6075,14 @@ async function compileBuildRoutes(options) {
   if (entryPoints.length === 0) {
     return { compiledFiles: [] };
   }
-  const absOutDir = path15.resolve(rootDir, outDir);
-  await fs10.promises.mkdir(absOutDir, { recursive: true });
+  const absDist = path15.resolve(rootDir, dist);
+  await fs10.promises.mkdir(absDist, { recursive: true });
   const plugins = buildAliasPlugins(rootDir);
   const esbuild = await import("esbuild");
-  const outbase = appDir === "." ? rootDir : path15.resolve(rootDir, appDir);
+  const outbase = path15.resolve(rootDir, APP_DIR4);
   await esbuild.build({
     entryPoints,
-    outdir: absOutDir,
+    outdir: absDist,
     outbase,
     bundle: false,
     platform: "node",
@@ -6113,10 +6096,12 @@ async function compileBuildRoutes(options) {
   });
   return { compiledFiles: entryPoints };
 }
+var APP_DIR4;
 var init_compileBuildRoutes = __esm({
   "src/cli/compileBuildRoutes.ts"() {
     "use strict";
     init_aliasPlugin();
+    APP_DIR4 = "src";
   }
 });
 
@@ -6129,20 +6114,17 @@ import path16 from "path";
 import fs11 from "fs";
 async function buildCommand(options) {
   const rootDir = options?.rootDir ?? process.cwd();
-  const outdir = options?.outDir ?? DEFAULT_PROD_OUT_DIR;
-  await compileConfig({ rootDir, outDir: outdir });
+  const outdir = options?.dist ?? DEFAULT_DIST2;
+  await compileConfig({ rootDir, dist: outdir });
   const _config = await loadConfig(rootDir, outdir);
-  const appDir = options?.appDir ?? process.env.FAAPI_APP_DIR ?? "src";
-  const patterns = appDir === "." ? ["api/**/*.ts"] : [`${appDir}/api/**/*.ts`];
   console.log("faapi build started");
   console.log(`- Root: ${rootDir}`);
-  console.log(`- AppDir: ${appDir}`);
+  console.log(`- Source: src/`);
   console.log(`- Output: ${outdir}`);
   console.log("\n[1/6] Compiling TypeScript (bundle: false)...");
   const result = await compileBuildRoutes({
     rootDir,
-    appDir,
-    outDir: outdir,
+    dist: outdir,
     logLevel: "silent"
   });
   console.log(`  Compiled ${result.compiledFiles.length} file(s)`);
@@ -6151,14 +6133,14 @@ async function buildCommand(options) {
     return;
   }
   console.log("\n[2/6] Compiling config...");
-  const configResult = await compileConfig({ rootDir, outDir: outdir });
+  const configResult = await compileConfig({ rootDir, dist: outdir });
   if (configResult.generated) {
     console.log(`  Written to ${configResult.outputFile}`);
   } else {
     console.log("  No config file found, skipped");
   }
   console.log("\n[3/6] Scanning routes...");
-  const { routes, wsRoutes } = await scanRoutes(rootDir, patterns, appDir, outdir);
+  const { routes, wsRoutes } = await scanRoutes(rootDir, PATTERNS3, outdir);
   const sorted = sortRoutes(routes);
   console.log(`  Found ${sorted.length} routes, ${wsRoutes.length} WS routes`);
   const conflicts = detectRouteConflicts(sorted);
@@ -6172,28 +6154,27 @@ async function buildCommand(options) {
     }
   }
   console.log("\n[4/6] Generating schema...");
-  await generateSchemaFiles(sorted, rootDir, appDir, outdir);
+  await generateSchemaFiles(sorted, rootDir, outdir);
   console.log(`  Schema: zod.js files under ${path16.resolve(rootDir, outdir)}`);
   console.log("\n[5/6] Generating routes manifest...");
   const routesPath = path16.resolve(rootDir, outdir, "faapi-routes.js");
-  const serialized = serializeRoutes(sorted, wsRoutes, rootDir, appDir, outdir);
+  const serialized = serializeRoutes(sorted, wsRoutes, rootDir, outdir);
   await writeRoutesModule(serialized, routesPath);
   console.log(`  Written to ${routesPath}`);
   console.log("\n[6/6] Generating entry file...");
   const mainPath = path16.resolve(rootDir, outdir, "main.js");
-  const createProdAppArgs = options?.outDir && options.outDir !== DEFAULT_PROD_OUT_DIR ? `{ outDir: '${options.outDir}' }` : "";
-  const listenArgs = options?.port ? String(options.port) : "";
+  const createProdAppArgs = options?.dist && options.dist !== DEFAULT_DIST2 ? `{ dist: '${outdir}' }` : "";
   const mainContent = `// \u7531 faapi build \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u624B\u52A8\u7F16\u8F91
 import { createProdApp } from '@faapi/faapi';
 
 const app = await createProdApp(${createProdAppArgs});
-await app.listen(${listenArgs});
+await app.listen();
 `;
   await fs11.promises.writeFile(mainPath, mainContent, "utf-8");
   console.log(`  Written to ${mainPath}`);
   console.log("\nfaapi build completed");
 }
-var DEFAULT_PROD_OUT_DIR;
+var DEFAULT_DIST2, PATTERNS3;
 var init_buildCommand = __esm({
   "src/cli/buildCommand.ts"() {
     "use strict";
@@ -6205,7 +6186,8 @@ var init_buildCommand = __esm({
     init_compileBuildRoutes();
     init_compileConfig();
     init_loadConfig();
-    DEFAULT_PROD_OUT_DIR = "dist";
+    DEFAULT_DIST2 = "dist";
+    PATTERNS3 = ["src/api/**/*.ts"];
   }
 });
 
@@ -6796,11 +6778,11 @@ var cac = (name = "") => new CAC(name);
 
 // src/cli/index.ts
 var cli = cac("faapi");
-cli.command("").alias("dev").option("--port <number>", "\u670D\u52A1\u7AEF\u53E3\uFF08\u9ED8\u8BA4 3000\uFF09").option("--appDir <dir>", "\u6E90\u7801\u76EE\u5F55\u524D\u7F00\uFF08\u9ED8\u8BA4 src\uFF09").action(async (options) => {
+cli.command("").alias("dev").option("--port <number>", "\u670D\u52A1\u7AEF\u53E3\uFF08\u9ED8\u8BA4 3000\uFF09").action(async (options) => {
   const { devCommand: devCommand2 } = await Promise.resolve().then(() => (init_devCommand(), devCommand_exports));
   await devCommand2(options);
 });
-cli.command("build", "Build for production").option("--port <number>", "prod \u670D\u52A1\u7AEF\u53E3\uFF0C\u5199\u5165 dist/main.js").option("--appDir <dir>", "\u6E90\u7801\u76EE\u5F55\u524D\u7F00\uFF08\u9ED8\u8BA4 src\uFF09").option("--outDir <dir>", "\u4EA7\u7269\u8F93\u51FA\u76EE\u5F55\uFF08\u9ED8\u8BA4 dist\uFF09").action(async (options) => {
+cli.command("build", "Build for production").option("--dist <dir>", "\u4EA7\u7269\u8F93\u51FA\u76EE\u5F55\uFF0C\u9ED8\u8BA4 dist").action(async (options) => {
   const { buildCommand: buildCommand2 } = await Promise.resolve().then(() => (init_buildCommand(), buildCommand_exports));
   await buildCommand2(options);
 });