@faapi/faapi 4.0.0 → 4.2.0

package/dist/testing.js

@@ -2842,6 +2842,15 @@ function toStrippedProdImportPath(sourceFile, rootDir) {
   if (!rel.startsWith(".")) rel = "./" + rel;
   return toProdExtension(rel);
 }
+function toProdImportFromImporter(importer, rootDir, relFromDist) {
+  const importerRel = path8.relative(toRealPath(path8.resolve(rootDir)), toRealPath(importer)).split(path8.sep).join("/");
+  const importerProdDir = path8.posix.dirname(toProdExtension(importerRel));
+  if (importerProdDir === ".") return relFromDist;
+  const target = relFromDist.replace(/^\.\//, "");
+  let rel = path8.posix.relative(importerProdDir, target);
+  if (!rel.startsWith(".")) rel = "./" + rel;
+  return rel;
+}
 var PROD_EXTS = [".js", ".mjs", ".cjs"];
 var SOURCE_EXTS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
 var INDEX_EXTS = [
@@ -2899,9 +2908,10 @@ function createAliasPlugin(config, options) {
               }
               if (appDirAbs && importerOutsideAppDir && isInsideDir(resolved, appDirAbs)) {
                 modified = true;
-                return `${prefix}${quote}${toStrippedProdImportPath(
-                  resolved,
-                  options.rootDir
+                return `${prefix}${quote}${toProdImportFromImporter(
+                  importer,
+                  options.rootDir,
+                  toStrippedProdImportPath(resolved, options.rootDir)
                 )}${quote}`;
               }
               modified = true;
@@ -2916,9 +2926,10 @@ function createAliasPlugin(config, options) {
               if (fs6.existsSync(file)) {
                 modified = true;
                 if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
-                  return `${prefix}${quote}${toStrippedProdImportPath(
-                    file,
-                    options.rootDir
+                  return `${prefix}${quote}${toProdImportFromImporter(
+                    importer,
+                    options.rootDir,
+                    toStrippedProdImportPath(file, options.rootDir)
                   )}${quote}`;
                 }
                 return `${prefix}${quote}${toProdImportPath(file, importer)}${quote}`;
@@ -2929,9 +2940,10 @@ function createAliasPlugin(config, options) {
               if (fs6.existsSync(file)) {
                 modified = true;
                 if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
-                  return `${prefix}${quote}${toStrippedProdImportPath(
-                    file,
-                    options.rootDir
+                  return `${prefix}${quote}${toProdImportFromImporter(
+                    importer,
+                    options.rootDir,
+                    toStrippedProdImportPath(file, options.rootDir)
                   )}${quote}`;
                 }
                 return `${prefix}${quote}${toProdImportPath(file, importer)}${quote}`;
@@ -4235,7 +4247,7 @@ function attachWebSocket(options) {
 
 // src/server/createServer.ts
 var DEFAULT_BODY_LIMIT = 10 * 1024 * 1024;
-function toWebRequest(req, bodyLimit = DEFAULT_BODY_LIMIT) {
+function toWebRequest(req, bodyLimit = DEFAULT_BODY_LIMIT, requestSignal) {
   const forwardedProto = req.headers["x-forwarded-proto"];
   const protocol = Array.isArray(forwardedProto) ? forwardedProto[0]?.split(",")[0]?.trim() ?? "http" : forwardedProto?.split(",")[0]?.trim() ?? "http";
   const host = req.headers.host ?? "localhost";
@@ -4243,7 +4255,10 @@ function toWebRequest(req, bodyLimit = DEFAULT_BODY_LIMIT) {
   const headers = nodeHttpToWebHeaders(req);
   const method = req.method ?? "GET";
   if (method === "GET" || method === "HEAD") {
-    return { request: new Request(url.toString(), { method, headers }), url };
+    return {
+      request: new Request(url.toString(), { method, headers, signal: requestSignal }),
+      url
+    };
   }
   const contentLength = req.headers["content-length"];
   if (contentLength !== void 0) {
@@ -4259,7 +4274,8 @@ function toWebRequest(req, bodyLimit = DEFAULT_BODY_LIMIT) {
       method,
       headers,
       body: limitedStream,
-      duplex: "half"
+      duplex: "half",
+      signal: requestSignal
     }),
     url
   };
@@ -4398,8 +4414,8 @@ function createServer(options) {
   });
   return { server, routesRef };
 }
-function prepareRequest(req, config, bodyLimit, trustedProxy, registries) {
-  const { request, url } = toWebRequest(req, bodyLimit);
+function prepareRequest(req, config, bodyLimit, trustedProxy, registries, requestSignal) {
+  const { request, url } = toWebRequest(req, bodyLimit, requestSignal);
   const method = request.method.toUpperCase();
   const urlPath = url.pathname;
   const ctx = createContextFromUrl(
@@ -4485,8 +4501,19 @@ async function sendErrorResponse(err, meta, res, onError, ctx) {
 async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries) {
   let meta = { headers: {}, setCookies: [] };
   let ctx;
+  const abortController = new AbortController();
+  res.on("close", () => {
+    if (!res.writableEnded) abortController.abort();
+  });
   try {
-    const prepared = prepareRequest(req, config, bodyLimit, trustedProxy, registries);
+    const prepared = prepareRequest(
+      req,
+      config,
+      bodyLimit,
+      trustedProxy,
+      registries,
+      abortController.signal
+    );
     ctx = prepared.ctx;
     meta = prepared.meta;
     const { request, url, method, urlPath } = prepared;