@modern-js/bff-core 1.0.1-beta.2 → 1.0.1-beta.3

package/dist/js/modern/api.js

@@ -25,17 +25,6 @@ export function Api(...args) {
   const validateHandlers = operators.filter(operator => operator.validate).map(operator => operator.validate);
 
   async function runner(inputs) {
-    // 错误组合传给用户哪些信息？
-    // 取出来所有的 schema，然后做校验
-    // 包裹中间件，怎么根据不同框架去包裹?
-    // 需要满足的需求，可以关闭某一样 schema 的校验
-    // 可以关闭某一个字段的校验
-    // 可以设置校验函数以替换 zod ？类型怎么搞?
-    // 全局可配置校验函数
-    // middleware 多框架实现要支持在路由上配，但这样 middleware 就要在校验之前先执行了
-    // 简易模式适配怎么处理?
-    // 不同框架适配，响应怎么处理？都传入 co ntext 给这个函数？
-    // 如何不依赖 zod 库？支持用户自定义 schema 库？ Query，Data 实现可以统一代码，类型好像无解，除非这些函数是创建出来的，保证只有 http 中依赖 zod 吧
     const executeHelper = {
       result: null,
 

package/dist/js/modern/client/generate-client.js

@@ -29,13 +29,12 @@ export const generateClient = async ({
 
   const apiRouter = new ApiRouter({
     apiDir,
-    prefix,
-    lambdaDir: apiDir
+    prefix
   });
   const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
 
   if (!handlerInfos) {
-    return Err(`Cannot require module ${resourcePath}`);
+    return Err(`generate client error: Cannot require module ${resourcePath}`);
   }
 
   let handlersCode = '';

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

@@ -60,87 +60,6 @@ export class ApiRouter {
     this.apiDir = _apiDir;
     this.lambdaDir = _lambdaDir || this.getLambdaDir(this.apiDir);
   }
-  /**
-   * 如果用户未传入或传入空串，默认为 /api
-   * 如果传入 /，则 prefix 为 /
-   */
-
-
-  initPrefix(prefix) {
-    if (prefix === '/') {
-      return '';
-    }
-
-    return prefix || '/api';
-  }
-
-  validateAbsolute(filename, paramsName) {
-    if (!path.isAbsolute(filename)) {
-      throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
-    }
-  }
-
-  getModuleInfos(filenames) {
-    return filenames.map(filename => this.getModuleInfo(filename)).filter(moduleInfo => Boolean(moduleInfo));
-  }
-
-  getModuleInfo(filename) {
-    try {
-      const module = requireHandlerModule(filename);
-      return {
-        filename,
-        module
-      };
-    } catch (err) {
-      if (process.env.NODE_ENV === 'production') {
-        throw err;
-      } else {
-        console.error(err);
-        return null;
-      }
-    }
-  }
-
-  getHandlerInfos(moduleInfos) {
-    let apiHandlers = [];
-    moduleInfos.forEach(moduleInfo => {
-      const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
-
-      if (handlerInfos) {
-        apiHandlers = apiHandlers.concat(handlerInfos);
-      }
-    });
-    const sortedHandlers = sortRoutes(apiHandlers);
-    return sortedHandlers;
-  }
-
-  getModuleHandlerInfos(moduleInfo) {
-    const {
-      module,
-      filename
-    } = moduleInfo;
-    return Object.entries(module).filter(([, handler]) => typeof handler === 'function').map(([key]) => {
-      const handler = module[key];
-      const handlerInfo = this.getHandlerInfo(filename, key, handler);
-      return handlerInfo;
-    }).filter(handlerInfo => Boolean(handlerInfo));
-  }
-
-  validateValidApifile(filename) {
-    if (!this.apiFiles.includes(filename)) {
-      throw new Error(`The ${filename} is not a valid api file.`);
-    }
-  }
-
-  getRoutePath(prefix, routeName) {
-    const finalRouteName = routeName === '/' ? '' : routeName;
-
-    if (prefix === '' && finalRouteName === '') {
-      return '/';
-    }
-
-    return `${prefix}${finalRouteName}`;
-  }
 
   isApiFile(filename) {
     if (!this.apiFiles.includes(filename)) {
@@ -271,5 +190,86 @@ export class ApiRouter {
     debug('apiHandlers', apiHandlers);
     return apiHandlers;
   }
+  /**
+   * 如果用户未传入或传入空串，默认为 /api
+   * 如果传入 /，则 prefix 为 /
+   */
+
+
+  initPrefix(prefix) {
+    if (prefix === '/') {
+      return '';
+    }
+
+    return prefix || '/api';
+  }
+
+  validateAbsolute(filename, paramsName) {
+    if (!path.isAbsolute(filename)) {
+      throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
+    }
+  }
+
+  getModuleInfos(filenames) {
+    return filenames.map(filename => this.getModuleInfo(filename)).filter(moduleInfo => Boolean(moduleInfo));
+  }
+
+  getModuleInfo(filename) {
+    try {
+      const module = requireHandlerModule(filename);
+      return {
+        filename,
+        module
+      };
+    } catch (err) {
+      if (process.env.NODE_ENV === 'production') {
+        throw err;
+      } else {
+        console.error(err);
+        return null;
+      }
+    }
+  }
+
+  getHandlerInfos(moduleInfos) {
+    let apiHandlers = [];
+    moduleInfos.forEach(moduleInfo => {
+      const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
+
+      if (handlerInfos) {
+        apiHandlers = apiHandlers.concat(handlerInfos);
+      }
+    });
+    const sortedHandlers = sortRoutes(apiHandlers);
+    return sortedHandlers;
+  }
+
+  getModuleHandlerInfos(moduleInfo) {
+    const {
+      module,
+      filename
+    } = moduleInfo;
+    return Object.entries(module).filter(([, handler]) => typeof handler === 'function').map(([key]) => {
+      const handler = module[key];
+      const handlerInfo = this.getHandlerInfo(filename, key, handler);
+      return handlerInfo;
+    }).filter(handlerInfo => Boolean(handlerInfo));
+  }
+
+  validateValidApifile(filename) {
+    if (!this.apiFiles.includes(filename)) {
+      throw new Error(`The ${filename} is not a valid api file.`);
+    }
+  }
+
+  getRoutePath(prefix, routeName) {
+    const finalRouteName = routeName === '/' ? '' : routeName;
+
+    if (prefix === '' && finalRouteName === '') {
+      return '/';
+    }
+
+    return `${prefix}${finalRouteName}`;
+  }
 
 }

package/dist/js/node/api.js

@@ -37,17 +37,6 @@ function Api(...args) {
   const validateHandlers = operators.filter(operator => operator.validate).map(operator => operator.validate);
 
   async function runner(inputs) {
-    // 错误组合传给用户哪些信息？
-    // 取出来所有的 schema，然后做校验
-    // 包裹中间件，怎么根据不同框架去包裹?
-    // 需要满足的需求，可以关闭某一样 schema 的校验
-    // 可以关闭某一个字段的校验
-    // 可以设置校验函数以替换 zod ？类型怎么搞?
-    // 全局可配置校验函数
-    // middleware 多框架实现要支持在路由上配，但这样 middleware 就要在校验之前先执行了
-    // 简易模式适配怎么处理?
-    // 不同框架适配，响应怎么处理？都传入 co ntext 给这个函数？
-    // 如何不依赖 zod 库？支持用户自定义 schema 库？ Query，Data 实现可以统一代码，类型好像无解，除非这些函数是创建出来的，保证只有 http 中依赖 zod 吧
     const executeHelper = {
       result: null,
 

package/dist/js/node/client/generate-client.js

@@ -45,13 +45,12 @@ const generateClient = async ({
 
   const apiRouter = new _router.ApiRouter({
     apiDir,
-    prefix,
-    lambdaDir: apiDir
+    prefix
   });
   const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
 
   if (!handlerInfos) {
-    return (0, _result.Err)(`Cannot require module ${resourcePath}`);
+    return (0, _result.Err)(`generate client error: Cannot require module ${resourcePath}`);
   }
 
   let handlersCode = '';

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

@@ -104,87 +104,6 @@ class ApiRouter {
     this.apiDir = _apiDir;
     this.lambdaDir = _lambdaDir || this.getLambdaDir(this.apiDir);
   }
-  /**
-   * 如果用户未传入或传入空串，默认为 /api
-   * 如果传入 /，则 prefix 为 /
-   */
-
-
-  initPrefix(prefix) {
-    if (prefix === '/') {
-      return '';
-    }
-
-    return prefix || '/api';
-  }
-
-  validateAbsolute(filename, paramsName) {
-    if (!_path.default.isAbsolute(filename)) {
-      throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
-    }
-  }
-
-  getModuleInfos(filenames) {
-    return filenames.map(filename => this.getModuleInfo(filename)).filter(moduleInfo => Boolean(moduleInfo));
-  }
-
-  getModuleInfo(filename) {
-    try {
-      const module = (0, _utils3.requireHandlerModule)(filename);
-      return {
-        filename,
-        module
-      };
-    } catch (err) {
-      if (process.env.NODE_ENV === 'production') {
-        throw err;
-      } else {
-        console.error(err);
-        return null;
-      }
-    }
-  }
-
-  getHandlerInfos(moduleInfos) {
-    let apiHandlers = [];
-    moduleInfos.forEach(moduleInfo => {
-      const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
-
-      if (handlerInfos) {
-        apiHandlers = apiHandlers.concat(handlerInfos);
-      }
-    });
-    const sortedHandlers = (0, _utils3.sortRoutes)(apiHandlers);
-    return sortedHandlers;
-  }
-
-  getModuleHandlerInfos(moduleInfo) {
-    const {
-      module,
-      filename
-    } = moduleInfo;
-    return Object.entries(module).filter(([, handler]) => typeof handler === 'function').map(([key]) => {
-      const handler = module[key];
-      const handlerInfo = this.getHandlerInfo(filename, key, handler);
-      return handlerInfo;
-    }).filter(handlerInfo => Boolean(handlerInfo));
-  }
-
-  validateValidApifile(filename) {
-    if (!this.apiFiles.includes(filename)) {
-      throw new Error(`The ${filename} is not a valid api file.`);
-    }
-  }
-
-  getRoutePath(prefix, routeName) {
-    const finalRouteName = routeName === '/' ? '' : routeName;
-
-    if (prefix === '' && finalRouteName === '') {
-      return '/';
-    }
-
-    return `${prefix}${finalRouteName}`;
-  }
 
   isApiFile(filename) {
     if (!this.apiFiles.includes(filename)) {
@@ -316,6 +235,87 @@ class ApiRouter {
     (0, _utils2.debug)('apiHandlers', apiHandlers);
     return apiHandlers;
   }
+  /**
+   * 如果用户未传入或传入空串，默认为 /api
+   * 如果传入 /，则 prefix 为 /
+   */
+
+
+  initPrefix(prefix) {
+    if (prefix === '/') {
+      return '';
+    }
+
+    return prefix || '/api';
+  }
+
+  validateAbsolute(filename, paramsName) {
+    if (!_path.default.isAbsolute(filename)) {
+      throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
+    }
+  }
+
+  getModuleInfos(filenames) {
+    return filenames.map(filename => this.getModuleInfo(filename)).filter(moduleInfo => Boolean(moduleInfo));
+  }
+
+  getModuleInfo(filename) {
+    try {
+      const module = (0, _utils3.requireHandlerModule)(filename);
+      return {
+        filename,
+        module
+      };
+    } catch (err) {
+      if (process.env.NODE_ENV === 'production') {
+        throw err;
+      } else {
+        console.error(err);
+        return null;
+      }
+    }
+  }
+
+  getHandlerInfos(moduleInfos) {
+    let apiHandlers = [];
+    moduleInfos.forEach(moduleInfo => {
+      const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
+
+      if (handlerInfos) {
+        apiHandlers = apiHandlers.concat(handlerInfos);
+      }
+    });
+    const sortedHandlers = (0, _utils3.sortRoutes)(apiHandlers);
+    return sortedHandlers;
+  }
+
+  getModuleHandlerInfos(moduleInfo) {
+    const {
+      module,
+      filename
+    } = moduleInfo;
+    return Object.entries(module).filter(([, handler]) => typeof handler === 'function').map(([key]) => {
+      const handler = module[key];
+      const handlerInfo = this.getHandlerInfo(filename, key, handler);
+      return handlerInfo;
+    }).filter(handlerInfo => Boolean(handlerInfo));
+  }
+
+  validateValidApifile(filename) {
+    if (!this.apiFiles.includes(filename)) {
+      throw new Error(`The ${filename} is not a valid api file.`);
+    }
+  }
+
+  getRoutePath(prefix, routeName) {
+    const finalRouteName = routeName === '/' ? '' : routeName;
+
+    if (prefix === '' && finalRouteName === '') {
+      return '/';
+    }
+
+    return `${prefix}${finalRouteName}`;
+  }
 
 }
 

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

@@ -18,6 +18,15 @@ export declare class ApiRouter {
     lambdaDir?: string;
     prefix?: string;
   });
+  isApiFile(filename: string): boolean;
+  getSingleModuleHandlers(filename: string): APIHandlerInfo[] | null;
+  getHandlerInfo(filename: string, originFuncName: string, handler: ApiHandler): APIHandlerInfo | null;
+  getSafeRoutePath(filename: string, handler?: ApiHandler): string;
+  getRouteName(filename: string, handler?: ApiHandler): string;
+  getHttpMethod(originHandlerName: string, handler?: ApiHandler): HttpMethod | null;
+  loadApiFiles(): string[];
+  getApiFiles(): string[];
+  getApiHandlers(): APIHandlerInfo[];
   /**
    * 如果用户未传入或传入空串，默认为 /api
    * 如果传入 /，则 prefix 为 /
@@ -34,13 +43,4 @@ export declare class ApiRouter {
   private getModuleHandlerInfos;
   private validateValidApifile;
   private getRoutePath;
-  isApiFile(filename: string): boolean;
-  getSingleModuleHandlers(filename: string): APIHandlerInfo[] | null;
-  getHandlerInfo(filename: string, originFuncName: string, handler: ApiHandler): APIHandlerInfo | null;
-  getSafeRoutePath(filename: string, handler?: ApiHandler): string;
-  getRouteName(filename: string, handler?: ApiHandler): string;
-  getHttpMethod(originHandlerName: string, handler?: ApiHandler): HttpMethod | null;
-  loadApiFiles(): string[];
-  getApiFiles(): string[];
-  getApiHandlers(): APIHandlerInfo[];
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.2",
+  "version": "1.0.1-beta.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -47,6 +47,11 @@
   "peerDependencies": {
     "zod": "^3.17.3"
   },
+  "peerDependenciesMeta": {
+    "zod": {
+      "optional": true
+    }
+  },
   "modernConfig": {
     "output": {
       "packageMode": "node-js"