@modern-js/bff-core 2.5.1-alpha.5 → 2.6.1-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/bff-core
 
+## 2.6.0
+
+### Patch Changes
+
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [0fe658a]
+  - @modern-js/utils@2.6.0
+  - @modern-js/bff-runtime@2.6.0
+
 ## 2.5.0
 
 ### Patch Changes

package/dist/cjs/api.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/client/{generate-client.js → generateClient.js}

@@ -17,16 +17,20 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var generate_client_exports = {};
-__export(generate_client_exports, {
+var generateClient_exports = {};
+__export(generateClient_exports, {
   DEFAULT_CLIENT_REQUEST_CREATOR: () => DEFAULT_CLIENT_REQUEST_CREATOR,
   generateClient: () => generateClient
 });
-module.exports = __toCommonJS(generate_client_exports);
+module.exports = __toCommonJS(generateClient_exports);
 var path = __toESM(require("path"));
 var import_router = require("../router");
 var import_result = require("./result");
@@ -77,7 +81,7 @@ const generateClient = async ({
     }
     const upperHttpMethod = httpMethod.toUpperCase();
     const routeName = routePath;
-    handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', ${process.env.PORT || String(port)}, '${httpMethodDecider}', ${fetcher ? `, fetch` : ""});
+    handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', ${process.env.PORT || String(port)}, '${httpMethodDecider ? httpMethodDecider : "functionName"}' ${fetcher ? `, fetch` : ""});
 `;
   }
   const importCode = `import { createRequest } from '${requestCreator}';

package/dist/cjs/client/index.js

@@ -14,4 +14,4 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var client_exports = {};
 module.exports = __toCommonJS(client_exports);
-__reExport(client_exports, require("./generate-client"), module.exports);
+__reExport(client_exports, require("./generateClient"), module.exports);

package/dist/cjs/operators/http.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/router/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -44,9 +48,9 @@ class ApiRouter {
     httpMethodDecider = "functionName"
   }) {
     this.apiFiles = [];
-    this.getExactApiMode = (apiDir) => {
+    this.getExactApiMode = (apiDir, lambdaDir) => {
       const exist = this.createExistChecker(apiDir);
-      const existLambdaDir = exist(import_constants.FRAMEWORK_MODE_LAMBDA_DIR);
+      const existLambdaDir = lambdaDir && import_utils.fs.pathExistsSync(lambdaDir) || exist(import_constants.FRAMEWORK_MODE_LAMBDA_DIR);
       const existAppDir = exist(import_constants.FRAMEWORK_MODE_APP_DIR);
       const existAppFile = exist("app.ts") || exist("app.js");
       if (existLambdaDir || existAppDir || existAppFile) {
@@ -55,21 +59,21 @@ class ApiRouter {
       return import_constants.APIMode.FUNCTION;
     };
     this.createExistChecker = (base) => (target) => import_utils.fs.pathExistsSync(import_path.default.resolve(base, target));
-    this.getExactLambdaDir = (apiDir) => {
-      if (this.lambdaDir) {
-        return this.lambdaDir;
+    this.getExactLambdaDir = (apiDir, originLambdaDir) => {
+      if (this.apiMode === import_constants.APIMode.FUNCTION) {
+        return apiDir;
       }
-      const lambdaDir = this.apiMode === import_constants.APIMode.FARMEWORK ? import_path.default.join(apiDir, import_constants.FRAMEWORK_MODE_LAMBDA_DIR) : apiDir;
-      return lambdaDir;
+      return originLambdaDir || import_path.default.join(apiDir, import_constants.FRAMEWORK_MODE_LAMBDA_DIR);
     };
     this.validateAbsolute(apiDir, "apiDir");
     this.validateAbsolute(lambdaDir, "lambdaDir");
     this.prefix = this.initPrefix(prefix);
     this.apiDir = apiDir;
-    this.apiMode = this.getExactApiMode(apiDir);
     this.httpMethodDecider = httpMethodDecider;
-    this.lambdaDir = lambdaDir || this.getExactLambdaDir(this.apiDir);
+    this.apiMode = this.getExactApiMode(apiDir, lambdaDir);
+    this.lambdaDir = this.getExactLambdaDir(this.apiDir, lambdaDir);
     this.existLambdaDir = import_utils.fs.existsSync(this.lambdaDir);
+    (0, import_utils2.debug)(`apiDir:`, this.apiDir, `lambdaDir:`, this.lambdaDir);
   }
   isExistLambda() {
     return this.existLambdaDir;
@@ -81,13 +85,10 @@ class ApiRouter {
     return this.lambdaDir;
   }
   isApiFile(filename) {
-    if (this.existLambdaDir) {
-      return false;
+    if (this.apiFiles.includes(filename)) {
+      return true;
     }
-    if (!this.apiFiles.includes(filename)) {
-      return false;
-    }
-    return true;
+    return false;
   }
   getSingleModuleHandlers(filename) {
     const moduleInfo = this.getModuleInfo(filename);
@@ -111,6 +112,7 @@ class ApiRouter {
     }
     return null;
   }
+  // TODO: 性能提升，开发环境，判断下 lambda 目录修改时间
   getSafeRoutePath(filename, handler) {
     this.loadApiFiles();
     this.validateValidApifile(filename);
@@ -209,6 +211,10 @@ class ApiRouter {
     (0, import_utils2.debug)("apiHandlers", apiHandlers.length, apiHandlers);
     return apiHandlers;
   }
+  /**
+   * 如果用户未传入或传入空串，默认为 /api
+   * 如果传入 /，则 prefix 为 /
+   */
   initPrefix(prefix) {
     if (prefix === "/") {
       return "";

package/dist/cjs/router/utils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/alias.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/storage.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/utils/validate.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/esm/client/{generate-client.js → generateClient.js}

@@ -48,7 +48,7 @@ const generateClient = async ({
     }
     const upperHttpMethod = httpMethod.toUpperCase();
     const routeName = routePath;
-    handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', ${process.env.PORT || String(port)}, '${httpMethodDecider}', ${fetcher ? `, fetch` : ""});
+    handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', ${process.env.PORT || String(port)}, '${httpMethodDecider ? httpMethodDecider : "functionName"}' ${fetcher ? `, fetch` : ""});
 `;
   }
   const importCode = `import { createRequest } from '${requestCreator}';

package/dist/esm/client/index.js

@@ -1 +1 @@
-export * from "./generate-client";
+export * from "./generateClient";

package/dist/esm/router/index.js

@@ -25,9 +25,9 @@ class ApiRouter {
     httpMethodDecider = "functionName"
   }) {
     this.apiFiles = [];
-    this.getExactApiMode = (apiDir) => {
+    this.getExactApiMode = (apiDir, lambdaDir) => {
       const exist = this.createExistChecker(apiDir);
-      const existLambdaDir = exist(FRAMEWORK_MODE_LAMBDA_DIR);
+      const existLambdaDir = lambdaDir && fs.pathExistsSync(lambdaDir) || exist(FRAMEWORK_MODE_LAMBDA_DIR);
       const existAppDir = exist(FRAMEWORK_MODE_APP_DIR);
       const existAppFile = exist("app.ts") || exist("app.js");
       if (existLambdaDir || existAppDir || existAppFile) {
@@ -36,21 +36,21 @@ class ApiRouter {
       return APIMode.FUNCTION;
     };
     this.createExistChecker = (base) => (target) => fs.pathExistsSync(path.resolve(base, target));
-    this.getExactLambdaDir = (apiDir) => {
-      if (this.lambdaDir) {
-        return this.lambdaDir;
+    this.getExactLambdaDir = (apiDir, originLambdaDir) => {
+      if (this.apiMode === APIMode.FUNCTION) {
+        return apiDir;
       }
-      const lambdaDir = this.apiMode === APIMode.FARMEWORK ? path.join(apiDir, FRAMEWORK_MODE_LAMBDA_DIR) : apiDir;
-      return lambdaDir;
+      return originLambdaDir || path.join(apiDir, FRAMEWORK_MODE_LAMBDA_DIR);
     };
     this.validateAbsolute(apiDir, "apiDir");
     this.validateAbsolute(lambdaDir, "lambdaDir");
     this.prefix = this.initPrefix(prefix);
     this.apiDir = apiDir;
-    this.apiMode = this.getExactApiMode(apiDir);
     this.httpMethodDecider = httpMethodDecider;
-    this.lambdaDir = lambdaDir || this.getExactLambdaDir(this.apiDir);
+    this.apiMode = this.getExactApiMode(apiDir, lambdaDir);
+    this.lambdaDir = this.getExactLambdaDir(this.apiDir, lambdaDir);
     this.existLambdaDir = fs.existsSync(this.lambdaDir);
+    debug(`apiDir:`, this.apiDir, `lambdaDir:`, this.lambdaDir);
   }
   isExistLambda() {
     return this.existLambdaDir;
@@ -62,13 +62,10 @@ class ApiRouter {
     return this.lambdaDir;
   }
   isApiFile(filename) {
-    if (this.existLambdaDir) {
-      return false;
+    if (this.apiFiles.includes(filename)) {
+      return true;
     }
-    if (!this.apiFiles.includes(filename)) {
-      return false;
-    }
-    return true;
+    return false;
   }
   getSingleModuleHandlers(filename) {
     const moduleInfo = this.getModuleInfo(filename);
@@ -92,6 +89,7 @@ class ApiRouter {
     }
     return null;
   }
+  // TODO: 性能提升，开发环境，判断下 lambda 目录修改时间
   getSafeRoutePath(filename, handler) {
     this.loadApiFiles();
     this.validateValidApifile(filename);
@@ -190,6 +188,10 @@ class ApiRouter {
     debug("apiHandlers", apiHandlers.length, apiHandlers);
     return apiHandlers;
   }
+  /**
+   * 如果用户未传入或传入空串，默认为 /api
+   * 如果传入 /，则 prefix 为 /
+   */
   initPrefix(prefix) {
     if (prefix === "/") {
       return "";

package/dist/types/client/{generate-client.d.ts → generateClient.d.ts}

@@ -12,7 +12,7 @@ export type GenClientOptions = {
   fetcher?: string;
   target?: string;
   requireResolve?: typeof require.resolve;
-  httpMethodDecider: HttpMethodDecider;
+  httpMethodDecider?: HttpMethodDecider;
 };
 export declare const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
 export declare const generateClient: ({

package/dist/types/client/index.d.ts

@@ -1 +1 @@
-export * from './generate-client';
+export * from './generateClient';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.1-alpha.5",
+  "version": "2.6.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -25,17 +25,17 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/bff-runtime": "2.5.0",
-    "@modern-js/utils": "2.5.0",
+    "@modern-js/bff-runtime": "2.6.0",
+    "@modern-js/utils": "2.6.0",
     "esbuild": "0.15.7",
     "esbuild-register": "^3.3.3",
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@modern-js/types": "^2.5.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0",
+    "@modern-js/types": "2.6.0",
+    "@scripts/build": "2.6.0",
+    "@scripts/jest-config": "2.6.0",
     "@types/jest": "^27",
     "@types/koa-compose": "^3.2.5",
     "@types/node": "^14",