@faapi/faapi 1.2.0 → 1.2.1

package/dist/cli/index.js

@@ -545,9 +545,14 @@ function getVitestImportActual() {
   if (typeof vi?.importActual !== "function") return void 0;
   return vi.importActual.bind(vi);
 }
-async function importWithCacheBust(filePath) {
+async function importWithCacheBust(filePath, bustViteCache = false) {
   const importActual = getVitestImportActual();
   if (importActual) {
+    if (bustViteCache) {
+      let url2 = pathToFileURL(filePath).href;
+      url2 += `?t=${Date.now()}`;
+      return await import(url2);
+    }
     return await importActual(filePath);
   }
   let url = pathToFileURL(filePath).href;
@@ -4324,31 +4329,28 @@ var init_compileOnDemand = __esm({
 });
 
 // src/loader/loadRouteModule.ts
+import fs11 from "fs";
 async function loadRouteModule(filePath, method, rootDir) {
-  let module;
-  try {
-    module = await importWithCacheBust(filePath);
-  } catch (err) {
-    if (isDevOnDemandEnabled() && rootDir) {
-      const dist = getDevDist();
-      if (dist) {
-        const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
+  if (isDevOnDemandEnabled() && rootDir) {
+    const dist = getDevDist();
+    if (dist) {
+      const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
+      if (sourcePath && fs11.existsSync(sourcePath)) {
         try {
-          const compiled = await ensureCompiled(sourcePath, rootDir, dist);
-          if (compiled) {
-            module = await importWithCacheBust(filePath);
-            const handler2 = resolveExport(module, method);
-            validateRouteModule(handler2, method, filePath);
-            return { handler: handler2, method };
-          }
+          await ensureCompiled(sourcePath, rootDir, dist);
         } catch (compileErr) {
-          const compileReason = compileErr instanceof Error ? compileErr.message : String(compileErr);
-          throw new Error(`Failed to compile route module "${sourcePath}": ${compileReason}`, {
+          const reason = compileErr instanceof Error ? compileErr.message : String(compileErr);
+          throw new Error(`Failed to compile route module "${sourcePath}": ${reason}`, {
             cause: compileErr
           });
         }
       }
     }
+  }
+  let module;
+  try {
+    module = await importWithCacheBust(filePath, isDevOnDemandEnabled());
+  } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
     throw new Error(`Failed to load route module "${filePath}": ${reason}`, { cause: err });
   }
@@ -5063,7 +5065,7 @@ function invalidateSchemaCache() {
 async function loadSchemaModule(schemaPath) {
   let mod = moduleCache.get(schemaPath);
   if (!mod) {
-    mod = await importWithCacheBust(schemaPath);
+    mod = await importWithCacheBust(schemaPath, isDevOnDemandEnabled());
     moduleCache.set(schemaPath, mod);
   }
   return mod;
@@ -5148,6 +5150,7 @@ var init_validateInput = __esm({
     init_schemaName();
     init_httpErrors();
     init_importWithCacheBust();
+    init_compileOnDemand();
     moduleCache = /* @__PURE__ */ new Map();
   }
 });
@@ -5459,6 +5462,7 @@ var init_wsHandler = __esm({
 });
 
 // src/server/handleWsUpgrade.ts
+import fs12 from "fs";
 import { WebSocketServer, WebSocket } from "ws";
 import path13 from "path";
 function getPathname(req) {
@@ -5467,24 +5471,16 @@ function getPathname(req) {
   return idx >= 0 ? url.slice(0, idx) : url;
 }
 async function loadWsHandler(filePath, ctx, rootDir) {
-  let module;
-  try {
-    module = await importWithCacheBust(filePath);
-  } catch (err) {
-    if (isDevOnDemandEnabled() && rootDir) {
-      const dist = getDevDist();
-      if (dist) {
-        const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-        const compiled = await ensureCompiled(sourcePath, rootDir, dist);
-        if (compiled) {
-          module = await importWithCacheBust(filePath);
-        }
+  if (isDevOnDemandEnabled() && rootDir) {
+    const dist = getDevDist();
+    if (dist) {
+      const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
+      if (sourcePath && fs12.existsSync(sourcePath)) {
+        await ensureCompiled(sourcePath, rootDir, dist);
       }
     }
-    if (!module) {
-      throw err;
-    }
   }
+  const module = await importWithCacheBust(filePath, isDevOnDemandEnabled());
   const handler = module["WS"];
   if (typeof handler !== "function") {
     throw new Error(`WS export not found in ${filePath}`);
@@ -5955,7 +5951,7 @@ var init_loadPlugins = __esm({
 });
 
 // src/cli/createAppCore.ts
-import fs11 from "fs";
+import fs13 from "fs";
 import path15 from "path";
 import { PassThrough } from "stream";
 function isFaapiConfigKey(key) {
@@ -5965,7 +5961,7 @@ async function createAppBase(options) {
   const rootDir = options?.rootDir ?? process.cwd();
   const dist = options?.dist ?? process.env.FAAPI_DIST ?? DEFAULT_DIST;
   const routesPath = path15.resolve(rootDir, dist, ROUTES_FILE);
-  if (!fs11.existsSync(routesPath)) {
+  if (!fs13.existsSync(routesPath)) {
     throw new Error(
       `[faapi] ${dist}/${ROUTES_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
     );
@@ -6138,6 +6134,10 @@ async function createAppBase(options) {
       if (config?.lifecycle?.onClose) {
         await config.lifecycle.onClose({ rootDir, routes: sorted, server });
       }
+      if (!server.listening) {
+        app.server = null;
+        return;
+      }
       return new Promise((resolve3) => {
         server.close((err) => {
           if (err) console.error("Error closing server:", err);
@@ -6287,7 +6287,7 @@ var init_devCommand = __esm({
 
 // src/cli/compileBuildRoutes.ts
 import path17 from "path";
-import fs12 from "fs";
+import fs14 from "fs";
 import fg3 from "fast-glob";
 async function compileBuildRoutes(options) {
   const { rootDir, dist, files, logLevel = "silent" } = options;
@@ -6301,7 +6301,7 @@ async function compileBuildRoutes(options) {
     return { compiledFiles: [] };
   }
   const absDist = path17.resolve(rootDir, dist);
-  await fs12.promises.mkdir(absDist, { recursive: true });
+  await fs14.promises.mkdir(absDist, { recursive: true });
   const plugins = buildAliasPlugins(rootDir);
   const esbuild = await import("esbuild");
   const outbase = path17.resolve(rootDir, APP_DIR3);
@@ -6336,7 +6336,7 @@ __export(buildCommand_exports, {
   buildCommand: () => buildCommand
 });
 import path18 from "path";
-import fs13 from "fs";
+import fs15 from "fs";
 async function buildCommand(options) {
   const rootDir = options?.rootDir ?? process.cwd();
   const outdir = options?.dist ?? DEFAULT_DIST2;
@@ -6399,7 +6399,7 @@ loadEnv(process.cwd());
 const app = await createProdApp(${createProdAppArgs});
 await app.listen();
 `;
-  await fs13.promises.writeFile(mainPath, mainContent, "utf-8");
+  await fs15.promises.writeFile(mainPath, mainContent, "utf-8");
   console.log(`  Written to ${mainPath}`);
   console.log("\nfaapi build completed");
 }