fix: bff Integration test (#6733)

web-infra-dev · Jan 15, 2025 · 39f955f · 39f955f
1 parent f5af01d
commit 39f955f
Show file tree

Hide file tree

Showing 49 changed files with 384 additions and 455 deletions.
diff --git a/.changeset/gorgeous-news-change.md b/.changeset/gorgeous-news-change.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/bff-core': patch
+---
+
+fix(bff): client bundle supplement env variables & fix bff test
+fix(bff): client 产物补充环境变量 & 集成测试问题修复
diff --git a/packages/cli/plugin-bff/src/cli.ts b/packages/cli/plugin-bff/src/cli.ts
@@ -84,7 +84,8 @@ export const bffPlugin = (): CliPlugin<AppTools> => ({
       const lambdaDir = apiRouter.getLambdaDir();
       const existLambda = apiRouter.isExistLambda();
 
-      const runtime = (bff as any)?.runtime || RUNTIME_CREATE_REQUEST;
+      const runtime =
+        (bff as any)?.runtimeCreateRequest || RUNTIME_CREATE_REQUEST;
       const relativeApiPath = path.relative(appDirectory, apiDirectory);
       const relativeLambdaPath = path.relative(appDirectory, lambdaDir);
 

diff --git a/packages/cli/plugin-bff/tests/__snapshots__/loader.test.ts.snap b/packages/cli/plugin-bff/tests/__snapshots__/loader.test.ts.snap
@@ -3,6 +3,6 @@
 exports[`bff loader should works well 1`] = `
 "import { createRequest } from '/packages/cli/plugin-bff/tests/fixtures/requestCreator/client.ts';
 
-export var get = createRequest({"path":"/api/hello","method":"GET","port":80,"httpMethodDecider":"functionName"});
+export var get = createRequest({path: '/api/hello',method: 'GET',port: 80,httpMethodDecider: 'functionName'});
       "
 `;
diff --git a/packages/server/bff-core/src/client/generateClient.ts b/packages/server/bff-core/src/client/generateClient.ts
@@ -76,17 +76,22 @@ export const generateClient = async ({
       };
       handlersCode += `export ${exportStatement} createUploader(${JSON.stringify(requestOptions)});`;
     } else {
-      const requestOptions = {
-        path: routeName,
-        method: upperHttpMethod,
-        port: process.env.PORT || port,
-        httpMethodDecider: httpMethodDecider || 'functionName',
-        domain,
-        ...(fetcher ? { fetch: 'fetch' } : {}),
-        requestId,
-      };
+      const portValue =
+        target === 'server'
+          ? `process.env.PORT || ${String(port)}`
+          : String(port);
+
+      const optionsStr = `{
+        path: '${routeName}',
+        method: '${upperHttpMethod}',
+        port: ${portValue},
+        httpMethodDecider: '${httpMethodDecider || 'functionName'}'
+        ${domain ? `, domain: '${domain}'` : ''}
+        ${fetcher ? ", fetch: 'fetch'" : ''}
+        ${requestId ? `, requestId: '${requestId}'` : ''}
+      }`.replace(/\n\s*/g, '');
 
-      handlersCode += `export ${exportStatement} createRequest(${JSON.stringify(requestOptions)});
+      handlersCode += `export ${exportStatement} createRequest(${optionsStr});
       `;
     }
   }

diff --git a/packages/server/bff-core/tests/client/__snapshots__/generateClient.test.ts.snap b/packages/server/bff-core/tests/client/__snapshots__/generateClient.test.ts.snap
@@ -3,25 +3,25 @@
 exports[`client generateClient should support cross croject invocation 1`] = `
 "import { createRequest } from '@modern-js/plugin-bff/runtime/create-request';
 
-export var DELETE = createRequest({"path":"/normal/origin","method":"DELETE","port":3000,"httpMethodDecider":"functionName","requestId":"tests"});
-      export default createRequest({"path":"/normal/origin","method":"GET","port":3000,"httpMethodDecider":"functionName","requestId":"tests"});
-      export var putRepo = createRequest({"path":"/put-repo","method":"PUT","port":3000,"httpMethodDecider":"functionName","requestId":"tests"});
+export var DELETE = createRequest({path: '/normal/origin',method: 'DELETE',port: 3000,httpMethodDecider: 'functionName', requestId: 'tests'});
+      export default createRequest({path: '/normal/origin',method: 'GET',port: 3000,httpMethodDecider: 'functionName', requestId: 'tests'});
+      export var putRepo = createRequest({path: '/put-repo',method: 'PUT',port: 3000,httpMethodDecider: 'functionName', requestId: 'tests'});
       "
 `;
 
 exports[`client generateClient should support operator 1`] = `
 "import { createRequest } from '@modern-js/plugin-bff/runtime/create-request';
 
-export var DELETE = createRequest({"path":"/normal/origin","method":"DELETE","port":3000,"httpMethodDecider":"functionName"});
-      export default createRequest({"path":"/normal/origin","method":"GET","port":3000,"httpMethodDecider":"functionName"});
-      export var putRepo = createRequest({"path":"/put-repo","method":"PUT","port":3000,"httpMethodDecider":"functionName"});
+export var DELETE = createRequest({path: '/normal/origin',method: 'DELETE',port: 3000,httpMethodDecider: 'functionName'});
+      export default createRequest({path: '/normal/origin',method: 'GET',port: 3000,httpMethodDecider: 'functionName'});
+      export var putRepo = createRequest({path: '/put-repo',method: 'PUT',port: 3000,httpMethodDecider: 'functionName'});
       "
 `;
 
 exports[`client generateClient should works correctly 1`] = `
 "import { createRequest } from '@modern-js/plugin-bff/runtime/create-request';
 
-export var get = createRequest({"path":"/api/:id/origin/foo","method":"GET","port":3000,"httpMethodDecider":"functionName"});
-      export var post = createRequest({"path":"/api/:id/origin/foo","method":"POST","port":3000,"httpMethodDecider":"functionName"});
+export var get = createRequest({path: '/api/:id/origin/foo',method: 'GET',port: 3000,httpMethodDecider: 'functionName'});
+      export var post = createRequest({path: '/api/:id/origin/foo',method: 'POST',port: 3000,httpMethodDecider: 'functionName'});
       "
 `;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/bff-api-app/tests/index.test.ts b/tests/integration/bff-api-app/tests/index.test.ts