@faapi/faapi 5.2.0 → 5.4.0

package/dist/index.d.ts

@@ -1368,6 +1368,17 @@ interface InjectOptions {
     path?: string;
     headers?: Record<string, string>;
     query?: Record<string, string>;
+    /**
+     * 请求体，语义按类型区分（与 fastify inject 约定一致）：
+     * - `string` / `Buffer` / `Uint8Array`：原样透传不二次编码（默认 content-type
+     *   分别为 `text/plain` / `application/octet-stream`）
+     * - 其他值（对象/数组等）：`JSON.stringify` 后发送，默认 content-type `application/json`
+     *
+     * 调用方显式传入的 `content-type` 头优先于默认值（string body +
+     * `application/x-www-form-urlencoded` 可直接测 form 表单路由）。
+     * 注意不要把 `JSON.stringify` 的结果当对象传——那会作为原始文本再被服务端
+     * JSON 解析一次，得到字符串而非对象。
+     */
     body?: unknown;
 }
 interface InjectResponse {

package/dist/index.js

@@ -1898,8 +1898,8 @@ function resolveExport(module, exportName) {
 // src/utils/importWithCacheBust.ts
 import { pathToFileURL } from "url";
 var loadTs;
-function setLoadTimestamp(ts10) {
-  loadTs = ts10;
+function setLoadTimestamp(ts11) {
+  loadTs = ts11;
 }
 function getVitestImportActual() {
   const vi = globalThis.vi;
@@ -1933,6 +1933,7 @@ import fs5 from "fs";
 import fg from "fast-glob";
 
 // src/cli/aliasPlugin.ts
+import ts7 from "typescript";
 import path5 from "path";
 import fs4 from "fs";
 
@@ -2063,7 +2064,14 @@ function resolveRelativeSpecifier(importer, specifier) {
   const importerDir = path5.dirname(importer);
   const base = path5.resolve(importerDir, specifier);
   if (PROD_EXTS.some((ext) => specifier.endsWith(ext))) {
-    return fs4.existsSync(base) ? base : null;
+    if (fs4.existsSync(base)) return base;
+    if (base.endsWith(".js")) {
+      for (const ext of [".ts", ".tsx", ".jsx"]) {
+        const file = base.slice(0, -3) + ext;
+        if (fs4.existsSync(file)) return file;
+      }
+    }
+    return null;
   }
   if (/\.(ts|tsx|jsx)$/.test(specifier)) {
     return fs4.existsSync(base) ? base : null;
@@ -2079,8 +2087,18 @@ function resolveRelativeSpecifier(importer, specifier) {
   return null;
 }
 function createAliasPlugin(config, options) {
-  const SPEC_RE2 = /(\bfrom\s*|import\s*\(\s*)(['"])([^'"]+)\2/g;
   const appDirAbs = options?.rootDir ? toRealPath(path5.resolve(options.rootDir, APP_DIR)) : null;
+  const probeCandidateFile = (candidate) => {
+    for (const ext of SOURCE_EXTS) {
+      const file = candidate + ext;
+      if (fs4.existsSync(file)) return file;
+    }
+    for (const indexExt of INDEX_EXTS) {
+      const file = candidate + indexExt;
+      if (fs4.existsSync(file)) return file;
+    }
+    return null;
+  };
   return {
     name: "faapi-alias",
     setup(build) {
@@ -2093,64 +2111,103 @@ function createAliasPlugin(config, options) {
         }
         const importer = args.path;
         const importerOutsideAppDir = appDirAbs ? !isInsideDir(importer, appDirAbs) : false;
-        let modified = false;
-        const newSource = source.replace(SPEC_RE2, (full, prefix, quote, specifier) => {
+        const sourceFile = ts7.createSourceFile(importer, source, ts7.ScriptTarget.Latest, false);
+        const literals = [];
+        const visit = (node) => {
+          if (ts7.isImportDeclaration(node)) {
+            if (!node.importClause?.isTypeOnly && node.moduleSpecifier) {
+              if (ts7.isStringLiteral(node.moduleSpecifier)) literals.push(node.moduleSpecifier);
+            }
+          } else if (ts7.isExportDeclaration(node)) {
+            if (!node.isTypeOnly && node.moduleSpecifier) {
+              if (ts7.isStringLiteral(node.moduleSpecifier)) literals.push(node.moduleSpecifier);
+            }
+          } else if (ts7.isCallExpression(node) && node.expression.kind === ts7.SyntaxKind.ImportKeyword && node.arguments[0] && ts7.isStringLiteral(node.arguments[0])) {
+            literals.push(node.arguments[0]);
+          }
+          ts7.forEachChild(node, visit);
+        };
+        ts7.forEachChild(sourceFile, visit);
+        const replacements = [];
+        const unresolvable = [];
+        for (const lit of literals) {
+          const specifier = lit.text;
           if (specifier.startsWith("/") || specifier.startsWith("file:") || specifier.startsWith("node:")) {
-            return full;
+            continue;
           }
           if (specifier.startsWith("./") || specifier.startsWith("../")) {
             const resolved = resolveRelativeSpecifier(importer, specifier);
-            if (resolved) {
-              if (PROD_EXTS.some((ext) => specifier.endsWith(ext))) {
-                return full;
-              }
-              if (appDirAbs && importerOutsideAppDir && isInsideDir(resolved, appDirAbs)) {
-                modified = true;
-                return `${prefix}${quote}${toProdImportFromImporter(
-                  importer,
-                  options.rootDir,
-                  toStrippedProdImportPath(resolved, options.rootDir)
-                )}${quote}`;
-              }
-              modified = true;
-              return `${prefix}${quote}${toProdImportPath(resolved, importer)}${quote}`;
+            if (!resolved) {
+              unresolvable.push(lit);
+              continue;
             }
-            return full;
-          }
-          const candidates = resolveAlias(specifier, config);
-          for (const candidate of candidates) {
-            for (const ext of SOURCE_EXTS) {
-              const file = candidate + ext;
-              if (fs4.existsSync(file)) {
-                modified = true;
-                if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
-                  return `${prefix}${quote}${toProdImportFromImporter(
-                    importer,
-                    options.rootDir,
-                    toStrippedProdImportPath(file, options.rootDir)
-                  )}${quote}`;
-                }
-                return `${prefix}${quote}${toProdImportPath(file, importer)}${quote}`;
-              }
+            if (PROD_EXTS.some((ext) => specifier.endsWith(ext))) continue;
+            let prodPath;
+            if (appDirAbs && importerOutsideAppDir && isInsideDir(resolved, appDirAbs)) {
+              prodPath = toProdImportFromImporter(
+                importer,
+                options.rootDir,
+                toStrippedProdImportPath(resolved, options.rootDir)
+              );
+            } else {
+              prodPath = toProdImportPath(resolved, importer);
             }
-            for (const indexExt of INDEX_EXTS) {
-              const file = candidate + indexExt;
-              if (fs4.existsSync(file)) {
-                modified = true;
-                if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
-                  return `${prefix}${quote}${toProdImportFromImporter(
-                    importer,
-                    options.rootDir,
-                    toStrippedProdImportPath(file, options.rootDir)
-                  )}${quote}`;
-                }
-                return `${prefix}${quote}${toProdImportPath(file, importer)}${quote}`;
-              }
+            const quote = source[lit.getStart(sourceFile)];
+            replacements.push({
+              start: lit.getStart(sourceFile),
+              end: lit.getEnd(),
+              text: quote + prodPath + quote
+            });
+            continue;
+          }
+          for (const candidate of resolveAlias(specifier, config)) {
+            const file = probeCandidateFile(candidate);
+            if (!file) continue;
+            let prodPath;
+            if (appDirAbs && importerOutsideAppDir && isInsideDir(file, appDirAbs)) {
+              prodPath = toProdImportFromImporter(
+                importer,
+                options.rootDir,
+                toStrippedProdImportPath(file, options.rootDir)
+              );
+            } else {
+              prodPath = toProdImportPath(file, importer);
             }
+            const quote = source[lit.getStart(sourceFile)];
+            replacements.push({
+              start: lit.getStart(sourceFile),
+              end: lit.getEnd(),
+              text: quote + prodPath + quote
+            });
+            break;
           }
-          return full;
-        });
-        if (!modified) return void 0;
+        }
+        if (unresolvable.length > 0) {
+          const lineStarts = sourceFile.getLineStarts();
+          return {
+            errors: unresolvable.map((lit) => {
+              const { line, character } = sourceFile.getLineAndCharacterOfPosition(
+                lit.getStart(sourceFile)
+              );
+              const lineEnd = line + 1 < lineStarts.length ? lineStarts[line + 1] : sourceFile.getEnd();
+              return {
+                text: `\u65E0\u6CD5\u89E3\u6790\u7684\u76F8\u5BF9\u5BFC\u5165 "${lit.text}"\u2014\u2014\u9879\u76EE\u5185\u4E0D\u5B58\u5728\u5BF9\u5E94\u6E90\u6587\u4EF6\uFF08faapi \u9010\u6587\u4EF6\u7F16\u8BD1\uFF08bundle: false\uFF09\u4E0D\u89E3\u6790\u4F9D\u8D56\uFF0C\u8BE5\u5BFC\u5165\u4F1A\u539F\u6837\u8FDB\u5165\u4EA7\u7269\uFF0C\u751F\u4EA7 Node ESM \u8FD0\u884C\u65F6\u62A5 ERR_MODULE_NOT_FOUND\uFF09\u3002\u8BF7\u4FEE\u6B63\u8DEF\u5F84\u6216\u8865\u5168\u540E\u7F00`,
+                location: {
+                  file: importer,
+                  line: line + 1,
+                  column: character,
+                  lineText: source.slice(lineStarts[line], lineEnd).replace(/\r?\n$/, "")
+                }
+              };
+            })
+          };
+        }
+        if (replacements.length === 0) return void 0;
+        replacements.sort((a, b) => b.start - a.start);
+        let newSource = source;
+        for (const r of replacements) {
+          newSource = newSource.slice(0, r.start) + r.text + newSource.slice(r.end);
+        }
         return { contents: newSource, loader: "default" };
       });
     }
@@ -2537,17 +2594,17 @@ import path11 from "path";
 import { existsSync } from "fs";
 
 // src/ast/extractToolMetadata.ts
-import ts8 from "typescript";
+import ts9 from "typescript";
 
 // src/ast/jsDocMetadata.ts
-import ts7 from "typescript";
+import ts8 from "typescript";
 function hasExportModifier(node) {
-  if (!ts7.canHaveModifiers(node)) return false;
-  const modifiers = ts7.getModifiers(node);
-  return !!modifiers?.some((m) => m.kind === ts7.SyntaxKind.ExportKeyword);
+  if (!ts8.canHaveModifiers(node)) return false;
+  const modifiers = ts8.getModifiers(node);
+  return !!modifiers?.some((m) => m.kind === ts8.SyntaxKind.ExportKeyword);
 }
 function getJSDocFromNode(node) {
-  const apiDocs = ts7.getJSDocCommentsAndTags(node).filter((entry) => ts7.isJSDoc(entry));
+  const apiDocs = ts8.getJSDocCommentsAndTags(node).filter((entry) => ts8.isJSDoc(entry));
   if (apiDocs.length > 0) return apiDocs[0];
   const directDocs = node.jsDoc;
   if (directDocs && directDocs.length > 0) return directDocs[0];
@@ -2593,18 +2650,18 @@ function extractToolMetadata(program, filePath, functionName, pathMeta) {
 }
 function findExportedFunction(sourceFile, functionName) {
   let result = null;
-  ts8.forEachChild(sourceFile, (node) => {
+  ts9.forEachChild(sourceFile, (node) => {
     if (result) return;
-    if (ts8.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === functionName) {
+    if (ts9.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === functionName) {
       result = { fn: node, jsDocOwner: node };
       return;
     }
-    if (ts8.isVariableStatement(node) && hasExportModifier(node)) {
+    if (ts9.isVariableStatement(node) && hasExportModifier(node)) {
       for (const decl of node.declarationList.declarations) {
         if (result) break;
-        const nameText = ts8.isIdentifier(decl.name) ? decl.name.text : decl.name.getText(sourceFile);
+        const nameText = ts9.isIdentifier(decl.name) ? decl.name.text : decl.name.getText(sourceFile);
         if (nameText !== functionName || !decl.initializer) continue;
-        if (ts8.isArrowFunction(decl.initializer) || ts8.isFunctionExpression(decl.initializer)) {
+        if (ts9.isArrowFunction(decl.initializer) || ts9.isFunctionExpression(decl.initializer)) {
           result = { fn: decl.initializer, jsDocOwner: node };
         }
       }
@@ -2616,7 +2673,7 @@ function getFirstParamTypeName(fn, sourceFile) {
   const firstParam = fn.parameters[0];
   if (!firstParam) return void 0;
   if (!firstParam.type) return void 0;
-  if (!ts8.isTypeReferenceNode(firstParam.type)) return void 0;
+  if (!ts9.isTypeReferenceNode(firstParam.type)) return void 0;
   return firstParam.type.typeName.getText(sourceFile);
 }
 
@@ -5088,7 +5145,7 @@ async function hydrateRoutes(manifest) {
 import path17 from "path";
 
 // src/ast/extractAgentMetadata.ts
-import ts9 from "typescript";
+import ts10 from "typescript";
 init_resolveTypeNode();
 function extractAgentMetadata(program, filePath, pathMeta) {
   const sourceFile = program.getSourceFile(filePath);
@@ -5132,23 +5189,23 @@ function extractAgentMetadata(program, filePath, pathMeta) {
 }
 function findConfigExport(sourceFile) {
   let result = null;
-  ts9.forEachChild(sourceFile, (node) => {
+  ts10.forEachChild(sourceFile, (node) => {
     if (result) return;
-    if (ts9.isVariableStatement(node) && hasExportModifier(node)) {
+    if (ts10.isVariableStatement(node) && hasExportModifier(node)) {
       for (const decl of node.declarationList.declarations) {
         if (result) break;
-        const nameText = ts9.isIdentifier(decl.name) ? decl.name.text : "";
+        const nameText = ts10.isIdentifier(decl.name) ? decl.name.text : "";
         if (nameText !== "config" || !decl.initializer) continue;
-        if (ts9.isObjectLiteralExpression(decl.initializer)) {
+        if (ts10.isObjectLiteralExpression(decl.initializer)) {
           result = { jsDocOwner: node, objectLiteral: decl.initializer };
-        } else if (ts9.isArrowFunction(decl.initializer)) {
+        } else if (ts10.isArrowFunction(decl.initializer)) {
           result = { jsDocOwner: node, objectLiteral: getReturnObjectLiteral(decl.initializer) };
         } else {
           result = { jsDocOwner: node, objectLiteral: null };
         }
       }
     }
-    if (ts9.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === "config") {
+    if (ts10.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === "config") {
       const returnObj = getReturnObjectLiteral(node);
       result = { jsDocOwner: node, objectLiteral: returnObj };
     }
@@ -5158,12 +5215,12 @@ function findConfigExport(sourceFile) {
 function getReturnObjectLiteral(fn) {
   const body = fn.body;
   if (!body) return null;
-  if (ts9.isObjectLiteralExpression(body)) {
+  if (ts10.isObjectLiteralExpression(body)) {
     return body;
   }
-  if (ts9.isBlock(body)) {
+  if (ts10.isBlock(body)) {
     for (const stmt of body.statements) {
-      if (ts9.isReturnStatement(stmt) && stmt.expression && ts9.isObjectLiteralExpression(stmt.expression)) {
+      if (ts10.isReturnStatement(stmt) && stmt.expression && ts10.isObjectLiteralExpression(stmt.expression)) {
         return stmt.expression;
       }
     }
@@ -5177,8 +5234,8 @@ function extractConfigFields(objLit, sourceFile) {
   let model;
   let maxTurns;
   for (const prop of objLit.properties) {
-    if (ts9.isSpreadAssignment(prop)) continue;
-    if (!ts9.isPropertyAssignment(prop)) {
+    if (ts10.isSpreadAssignment(prop)) continue;
+    if (!ts10.isPropertyAssignment(prop)) {
       throw SchemaExtractionError.at(
         prop,
         "config",
@@ -5226,13 +5283,13 @@ function extractConfigFields(objLit, sourceFile) {
   return { systemPrompt, tools, agents, model, maxTurns };
 }
 function getPropertyName(name) {
-  if (ts9.isIdentifier(name)) return name.text;
-  if (ts9.isStringLiteral(name)) return name.text;
+  if (ts10.isIdentifier(name)) return name.text;
+  if (ts10.isStringLiteral(name)) return name.text;
   return null;
 }
 function extractStringValue(expr) {
   if (isStringLikeLiteral(expr)) return expr.text;
-  if (ts9.isBinaryExpression(expr) && expr.operatorToken.kind === ts9.SyntaxKind.PlusToken) {
+  if (ts10.isBinaryExpression(expr) && expr.operatorToken.kind === ts10.SyntaxKind.PlusToken) {
     const left = extractStringValue(expr.left);
     if (left === void 0) return void 0;
     const right = extractStringValue(expr.right);
@@ -5278,17 +5335,17 @@ function requireNumberValue(prop, fieldName, sourceFile) {
   return value;
 }
 function extractNumberValue(expr) {
-  if (ts9.isNumericLiteral(expr)) {
+  if (ts10.isNumericLiteral(expr)) {
     const num = Number(expr.text);
     return Number.isNaN(num) ? void 0 : num;
   }
   return void 0;
 }
 function isStringLikeLiteral(node) {
-  return ts9.isStringLiteral(node) || ts9.isNoSubstitutionTemplateLiteral(node);
+  return ts10.isStringLiteral(node) || ts10.isNoSubstitutionTemplateLiteral(node);
 }
 function extractStringArrayValue(expr) {
-  if (!ts9.isArrayLiteralExpression(expr)) return void 0;
+  if (!ts10.isArrayLiteralExpression(expr)) return void 0;
   const values = [];
   for (const element of expr.elements) {
     const value = extractStringValue(element);
@@ -5833,13 +5890,28 @@ async function createAppBase(options) {
           reject(new Error("No request handler found"));
           return;
         }
-        const mockReq = Readable3.from(body !== void 0 ? [Buffer.from(JSON.stringify(body))] : []);
+        let payload;
+        let defaultContentType;
+        if (body !== void 0) {
+          if (typeof body === "string") {
+            payload = Buffer.from(body, "utf-8");
+            defaultContentType = "text/plain";
+          } else if (body instanceof Uint8Array) {
+            payload = Buffer.from(body);
+            defaultContentType = "application/octet-stream";
+          } else {
+            payload = Buffer.from(JSON.stringify(body));
+            defaultContentType = "application/json";
+          }
+        }
+        const mockReq = Readable3.from(payload !== void 0 ? [payload] : []);
         mockReq.method = method;
         mockReq.url = `${reqPath}${queryStr}`;
+        const hasCallerContentType = "content-type" in reqHeaders || "Content-Type" in reqHeaders;
         mockReq.headers = {
           ...reqHeaders,
           host: "localhost",
-          "content-type": body !== void 0 ? "application/json" : void 0
+          ...payload !== void 0 && !hasCallerContentType ? { "content-type": defaultContentType } : {}
         };
         mockReq.socket = { remoteAddress: "127.0.0.1" };
         handler(