@modern-js/bff-core 1.15.0 → 1.16.0

package/CHANGELOG.md

@@ -0,0 +1,19 @@
+# @modern-js/bff-core
+
+## 1.16.0
+
+### Minor Changes
+
+- 020b9bd52: feat: support frame mode without lambda directories
+  feat: 支持无 lambda 目录的框架模式
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/bff-runtime@1.16.0

package/dist/js/modern/router/index.js

@@ -19,6 +19,8 @@ export class ApiRouter {
 
     _defineProperty(this, "lambdaDir", void 0);
 
+    _defineProperty(this, "existLambda", void 0);
+
     _defineProperty(this, "prefix", void 0);
 
     _defineProperty(this, "apiFiles", void 0);
@@ -35,7 +37,7 @@ export class ApiRouter {
 
     _defineProperty(this, "createExistChecker", base => target => fs.pathExistsSync(path.resolve(base, target)));
 
-    _defineProperty(this, "getLambdaDir", apiDir => {
+    _defineProperty(this, "getExactLambdaDir", apiDir => {
       if (this.lambdaDir) {
         return this.lambdaDir;
       }
@@ -57,10 +59,23 @@ export class ApiRouter {
 
     this.prefix = this.initPrefix(prefix);
     this.apiDir = _apiDir;
-    this.lambdaDir = _lambdaDir || this.getLambdaDir(this.apiDir);
+    this.lambdaDir = _lambdaDir || this.getExactLambdaDir(this.apiDir);
+    this.existLambda = this.checkExistLambda(this.apiDir, this.lambdaDir);
+  }
+
+  isExistLambda() {
+    return this.existLambda;
+  }
+
+  getLambdaDir() {
+    return this.lambdaDir;
   }
 
   isApiFile(filename) {
+    if (this.existLambda) {
+      return false;
+    }
+
     if (!this.apiFiles.includes(filename)) {
       return false;
     }
@@ -169,12 +184,20 @@ export class ApiRouter {
   }
 
   loadApiFiles() {
-    // eslint-disable-next-line no-multi-assign
+    if (!this.existLambda) {
+      return [];
+    } // eslint-disable-next-line no-multi-assign
+
+
     const apiFiles = this.apiFiles = getFiles(this.lambdaDir, API_FILE_RULES);
     return apiFiles;
   }
 
   getApiFiles() {
+    if (!this.existLambda) {
+      return [];
+    }
+
     if (this.apiFiles.length > 0) {
       return this.apiFiles;
     }
@@ -203,6 +226,37 @@ export class ApiRouter {
     return prefix || '/api';
   }
 
+  checkExistLambda(apiDir, lambdaDir) {
+    const isSame = apiDir === lambdaDir;
+
+    if (!isSame) {
+      return true;
+    }
+
+    const exts = ['.ts', '.js'];
+
+    const existAppDir = apiDir => {
+      return fs.existsSync(path.join(apiDir, 'app'));
+    };
+
+    const existAppFile = apiDir => {
+      const exists = exts.some(ext => {
+        return fs.existsSync(path.join(apiDir, `app${ext}`));
+      });
+      return exists;
+    };
+
+    if (isSame && existAppDir(apiDir)) {
+      return false;
+    }
+
+    if (isSame && existAppFile(apiDir)) {
+      return false;
+    }
+
+    return true;
+  }
+
   validateAbsolute(filename, paramsName) {
     if (!path.isAbsolute(filename)) {
       throw new Error(`The ${paramsName} ${filename} is not a abolute path`);

package/dist/js/node/router/index.js

@@ -62,6 +62,8 @@ class ApiRouter {
 
     _defineProperty(this, "lambdaDir", void 0);
 
+    _defineProperty(this, "existLambda", void 0);
+
     _defineProperty(this, "prefix", void 0);
 
     _defineProperty(this, "apiFiles", void 0);
@@ -78,7 +80,7 @@ class ApiRouter {
 
     _defineProperty(this, "createExistChecker", base => target => _utils.fs.pathExistsSync(_path.default.resolve(base, target)));
 
-    _defineProperty(this, "getLambdaDir", apiDir => {
+    _defineProperty(this, "getExactLambdaDir", apiDir => {
       if (this.lambdaDir) {
         return this.lambdaDir;
       }
@@ -100,10 +102,23 @@ class ApiRouter {
 
     this.prefix = this.initPrefix(prefix);
     this.apiDir = _apiDir;
-    this.lambdaDir = _lambdaDir || this.getLambdaDir(this.apiDir);
+    this.lambdaDir = _lambdaDir || this.getExactLambdaDir(this.apiDir);
+    this.existLambda = this.checkExistLambda(this.apiDir, this.lambdaDir);
+  }
+
+  isExistLambda() {
+    return this.existLambda;
+  }
+
+  getLambdaDir() {
+    return this.lambdaDir;
   }
 
   isApiFile(filename) {
+    if (this.existLambda) {
+      return false;
+    }
+
     if (!this.apiFiles.includes(filename)) {
       return false;
     }
@@ -213,12 +228,20 @@ class ApiRouter {
   }
 
   loadApiFiles() {
-    // eslint-disable-next-line no-multi-assign
+    if (!this.existLambda) {
+      return [];
+    } // eslint-disable-next-line no-multi-assign
+
+
     const apiFiles = this.apiFiles = (0, _utils3.getFiles)(this.lambdaDir, _constants.API_FILE_RULES);
     return apiFiles;
   }
 
   getApiFiles() {
+    if (!this.existLambda) {
+      return [];
+    }
+
     if (this.apiFiles.length > 0) {
       return this.apiFiles;
     }
@@ -247,6 +270,37 @@ class ApiRouter {
     return prefix || '/api';
   }
 
+  checkExistLambda(apiDir, lambdaDir) {
+    const isSame = apiDir === lambdaDir;
+
+    if (!isSame) {
+      return true;
+    }
+
+    const exts = ['.ts', '.js'];
+
+    const existAppDir = apiDir => {
+      return _utils.fs.existsSync(_path.default.join(apiDir, 'app'));
+    };
+
+    const existAppFile = apiDir => {
+      const exists = exts.some(ext => {
+        return _utils.fs.existsSync(_path.default.join(apiDir, `app${ext}`));
+      });
+      return exists;
+    };
+
+    if (isSame && existAppDir(apiDir)) {
+      return false;
+    }
+
+    if (isSame && existAppFile(apiDir)) {
+      return false;
+    }
+
+    return true;
+  }
+
   validateAbsolute(filename, paramsName) {
     if (!_path.default.isAbsolute(filename)) {
       throw new Error(`The ${paramsName} ${filename} is not a abolute path`);

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

@@ -6,6 +6,7 @@ export * from './constants';
 export declare class ApiRouter {
   private apiDir;
   private lambdaDir;
+  private existLambda;
   private prefix;
   private apiFiles;
   constructor({
@@ -17,6 +18,8 @@ export declare class ApiRouter {
     lambdaDir?: string;
     prefix?: string;
   });
+  isExistLambda(): boolean;
+  getLambdaDir(): string;
   isApiFile(filename: string): boolean;
   getSingleModuleHandlers(filename: string): APIHandlerInfo[] | null;
   getHandlerInfo(filename: string, originFuncName: string, handler: ApiHandler): APIHandlerInfo | null;
@@ -32,10 +35,11 @@ export declare class ApiRouter {
    */
 
   private initPrefix;
+  private checkExistLambda;
   private validateAbsolute;
   private getAPIMode;
   private createExistChecker;
-  private getLambdaDir;
+  private getExactLambdaDir;
   private getModuleInfos;
   private getModuleInfo;
   private getHandlerInfos;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.0",
+  "version": "1.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/bff-runtime": "1.15.0",
-    "@modern-js/utils": "1.15.0",
+    "@modern-js/bff-runtime": "1.16.0",
+    "@modern-js/utils": "1.16.0",
     "esbuild": "^0.14.38",
     "esbuild-register": "^3.3.3",
     "koa-compose": "^4.1.0",