@modern-js/bff-core 1.22.2-beta.0 → 1.22.3

package/CHANGELOG.md

@@ -1,159 +1,55 @@
 # @modern-js/bff-core
 
-## 2.0.0-beta.4
-
-### Major Changes
-
-- dda38c9c3e: chore: v2
+## 1.22.3
 
 ### Patch Changes
 
-- 2344eb26ed: fix: esbuild should not handle js files
-  fix: esbuild 不应该处理非 js 文件
-- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
-
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
-
-- Updated dependencies [7879e8f]
-- Updated dependencies [6aca875]
-- Updated dependencies [2e6031955e]
-- Updated dependencies [7b7d12c]
-- Updated dependencies [92f0eade39]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f2e9]
-- Updated dependencies [92004d1906]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9c3e]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [b710adb843]
-- Updated dependencies [ea7cf06]
-- Updated dependencies [bbe4c4a]
-- Updated dependencies [e4558a0]
-- Updated dependencies [abf3421a75]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712da84]
-  - @modern-js/utils@2.0.0-beta.4
-  - @modern-js/bff-runtime@2.0.0-beta.4
-
-## 2.0.0-beta.3
-
-### Major Changes
-
-- dda38c9c3e: chore: v2
+- @modern-js/bff-runtime@1.22.3
+- @modern-js/utils@1.22.3
+
+## 1.22.2
 
 ### Patch Changes
 
-- 2344eb26ed: fix: esbuild should not handle js files
-  fix: esbuild 不应该处理非 js 文件
-- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
-
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
-
-- Updated dependencies [6aca875]
-- Updated dependencies [2e60319]
-- Updated dependencies [92f0eade39]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f2e9]
-- Updated dependencies [92004d1906]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9c3e]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [b710adb]
-- Updated dependencies [ea7cf06]
-- Updated dependencies [bbe4c4a]
-- Updated dependencies [e4558a0]
-- Updated dependencies [abf3421a75]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712da84]
-  - @modern-js/utils@2.0.0-beta.3
-  - @modern-js/bff-runtime@2.0.0-beta.3
-
-## 2.0.0-beta.2
-
-### Major Changes
-
-- dda38c9c3e: chore: v2
+- @modern-js/bff-runtime@1.22.2
+- @modern-js/utils@1.22.2
 
-### Patch Changes
+## 1.22.1
 
-- 2344eb2: fix: esbuild should not handle js files
-  fix: esbuild 不应该处理非 js 文件
-- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+### Patch Changes
 
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+- @modern-js/bff-runtime@1.22.1
+- @modern-js/utils@1.22.1
 
-- Updated dependencies [92f0ead]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f2e9]
-- Updated dependencies [92004d1]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9c3e]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [abf3421a75]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712da84]
-  - @modern-js/utils@2.0.0-beta.2
-  - @modern-js/bff-runtime@2.0.0-beta.2
+## 1.21.6
 
-## 2.0.0-beta.1
+### Patch Changes
 
-### Major Changes
+- @modern-js/bff-runtime@1.21.6
+- @modern-js/utils@1.21.6
 
-- dda38c9: chore: v2
+## 1.21.5
 
 ### Patch Changes
 
-- 2344eb2: fix: esbuild should not handle js files
+- 4876aa7: fix: esbuild should not handle js files
   fix: esbuild 不应该处理非 js 文件
-- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+  - @modern-js/bff-runtime@1.21.5
+  - @modern-js/utils@1.21.5
 
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+## 1.21.4
 
-- Updated dependencies [92f0ead]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f]
-- Updated dependencies [92004d1]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [abf3421]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712d]
-  - @modern-js/utils@2.0.0-beta.1
-  - @modern-js/bff-runtime@2.0.0-beta.1
-
-## 2.0.0-beta.0
+### Patch Changes
 
-### Major Changes
+- @modern-js/bff-runtime@1.21.4
+- @modern-js/utils@1.21.4
 
-- dda38c9: chore: v2
+## 1.21.3
 
 ### Patch Changes
 
-- a2509bf: feat: bump esbuild from 0.14.38 to 0.15.7
-
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
-
-- Updated dependencies [edd1cfb1a]
-- Updated dependencies [cc971eabf]
-- Updated dependencies [5b9049f]
-- Updated dependencies [b8bbe036c]
-- Updated dependencies [d5a31df78]
-- Updated dependencies [dda38c9]
-- Updated dependencies [3bbea92b2]
-- Updated dependencies [abf3421]
-- Updated dependencies [543be95]
-- Updated dependencies [14b712d]
-  - @modern-js/utils@2.0.0-beta.0
-  - @modern-js/bff-runtime@2.0.0-beta.0
+- @modern-js/bff-runtime@1.21.3
+- @modern-js/utils@1.21.3
 
 ## 1.21.2
 

package/dist/js/modern/api.js

@@ -1,69 +1,54 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import "reflect-metadata";
-import compose from "koa-compose";
+import 'reflect-metadata';
+import compose from 'koa-compose';
 import { validateFunction, HANDLER_WITH_META } from "./utils";
-function Api(...args) {
+export function Api(...args) {
   const handler = args.pop();
-  validateFunction(handler, "Apihandler");
+  validateFunction(handler, 'Apihandler');
   const operators = args;
   const metadataHelper = {
     getMetadata(key) {
       return Reflect.getMetadata(key, runner);
     },
+
     setMetadata(key, value) {
       return Reflect.defineMetadata(key, value, runner);
     }
+
   };
+
   for (const operator of operators) {
     if (operator.metadata) {
       operator.metadata(metadataHelper);
     }
   }
-  const validateHandlers = operators.filter((operator) => operator.validate).map((operator) => operator.validate);
-  const pipeHandlers = operators.filter((operator) => operator.execute).map((operator) => operator.execute);
-  function runner(inputs) {
-    return __async(this, null, function* () {
-      const executeHelper = {
-        result: null,
-        get inputs() {
-          return inputs;
-        },
-        set inputs(val) {
-          inputs = val;
-        }
-      };
-      const stack = [...validateHandlers, ...pipeHandlers];
-      stack.push((helper, next) => __async(this, null, function* () {
-        const res = yield handler(helper.inputs);
-        helper.result = res;
-        return next();
-      }));
-      yield compose(stack)(executeHelper);
-      return executeHelper.result;
+
+  const validateHandlers = operators.filter(operator => operator.validate).map(operator => operator.validate);
+  const pipeHandlers = operators.filter(operator => operator.execute).map(operator => operator.execute);
+
+  async function runner(inputs) {
+    const executeHelper = {
+      result: null,
+
+      get inputs() {
+        return inputs;
+      },
+
+      set inputs(val) {
+        // eslint-disable-next-line no-param-reassign
+        inputs = val;
+      }
+
+    };
+    const stack = [...validateHandlers, ...pipeHandlers];
+    stack.push(async (helper, next) => {
+      const res = await handler(helper.inputs);
+      helper.result = res;
+      return next();
     });
+    await compose(stack)(executeHelper);
+    return executeHelper.result;
   }
+
   runner[HANDLER_WITH_META] = true;
   return runner;
-}
-export {
-  Api
-};
+}

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

@@ -1,28 +1,8 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import * as path from "path";
+import * as path from 'path';
 import { ApiRouter } from "../router";
 import { Ok, Err } from "./result";
-const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-const generateClient = (_0) => __async(void 0, [_0], function* ({
+export const DEFAULT_CLIENT_REQUEST_CREATOR = '@modern-js/create-request';
+export const generateClient = async ({
   resourcePath,
   apiDir,
   prefix,
@@ -30,52 +10,54 @@ const generateClient = (_0) => __async(void 0, [_0], function* ({
   target,
   requestCreator,
   fetcher,
-  requireResolve = require.resolve
-}) {
+  requireResolve: _requireResolve = require.resolve
+}) => {
   if (!requestCreator) {
-    requestCreator = requireResolve(
-      `${DEFAULT_CLIENT_REQUEST_CREATOR}${target ? `/${target}` : ""}`
-    ).replace(/\\/g, "/");
+    // eslint-disable-next-line no-param-reassign
+    requestCreator = _requireResolve(`${DEFAULT_CLIENT_REQUEST_CREATOR}${target ? `/${target}` : ''}`).replace(/\\/g, '/');
   } else {
+    // 这里约束传入的 requestCreator 包也必须有两个导出 client 和 server，因为目前的机制 client 和 server 要导出不同的 configure 函数；该 api 不对使用者暴露，后续可优化
     let resolvedPath = requestCreator;
+
     try {
-      resolvedPath = path.dirname(requireResolve(requestCreator));
-    } catch (error) {
-    }
-    requestCreator = `${resolvedPath}${target ? `/${target}` : ""}`.replace(
-      /\\/g,
-      "/"
-    );
+      resolvedPath = path.dirname(_requireResolve(requestCreator));
+    } catch (error) {} // eslint-disable-next-line no-param-reassign
+
+
+    requestCreator = `${resolvedPath}${target ? `/${target}` : ''}`.replace(/\\/g, '/');
   }
+
   const apiRouter = new ApiRouter({
     apiDir,
     prefix
   });
   const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
+
   if (!handlerInfos) {
     return Err(`generate client error: Cannot require module ${resourcePath}`);
   }
-  let handlersCode = "";
+
+  let handlersCode = '';
+
   for (const handlerInfo of handlerInfos) {
-    const { name, httpMethod, routePath } = handlerInfo;
-    let exportStatement = `var ${name} =`;
-    if (name.toLowerCase() === "default") {
-      exportStatement = "default";
+    const {
+      name,
+      httpMethod,
+      routePath
+    } = handlerInfo;
+    let exportStatement = `const ${name} =`;
+
+    if (name.toLowerCase() === 'default') {
+      exportStatement = 'default';
     }
+
     const upperHttpMethod = httpMethod.toUpperCase();
     const routeName = routePath;
-    handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', process.env.PORT || ${String(
-      port
-    )}${fetcher ? `, fetch` : ""});
+    handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', process.env.PORT || ${String(port)}${fetcher ? `, fetch` : ''});
 `;
   }
+
   const importCode = `import { createRequest } from '${requestCreator}';
-${fetcher ? `import { fetch } from '${fetcher}';
-` : ""}`;
-  return Ok(`${importCode}
-${handlersCode}`);
-});
-export {
-  DEFAULT_CLIENT_REQUEST_CREATOR,
-  generateClient
-};
+${fetcher ? `import { fetch } from '${fetcher}';\n` : ''}`;
+  return Ok(`${importCode}\n${handlersCode}`);
+};

package/dist/js/modern/client/index.js

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

package/dist/js/modern/client/result.js

@@ -1,22 +1,20 @@
-const Err = (value) => {
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const Err = value => {
   const err = {
-    kind: "Err",
+    kind: 'Err',
     value,
     isErr: true,
     isOk: false
   };
   return err;
-};
-const Ok = (value) => {
+}; // eslint-disable-next-line @typescript-eslint/no-redeclare
+
+export const Ok = value => {
   const ok = {
-    kind: "Ok",
+    kind: 'Ok',
     value,
     isErr: false,
     isOk: true
   };
   return ok;
-};
-export {
-  Err,
-  Ok
-};
+};

package/dist/js/modern/errors/http.js

@@ -1,16 +1,22 @@
-class HttpError extends Error {
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+export class HttpError extends Error {
   constructor(status, message) {
     super(message);
+
+    _defineProperty(this, "status", void 0);
+
     this.status = status;
   }
+
 }
-class ValidationError extends HttpError {
+export class ValidationError extends HttpError {
   constructor(status, message) {
     super(status, message);
-    this.code = "VALIDATION_ERROR";
+
+    _defineProperty(this, "code", void 0);
+
+    this.code = 'VALIDATION_ERROR';
   }
-}
-export {
-  HttpError,
-  ValidationError
-};
+
+}

package/dist/js/modern/index.js

@@ -1,23 +1,7 @@
-import { Api } from "./api";
-import { HttpError, ValidationError } from "./errors/http";
+export { Api } from "./api";
+export { HttpError, ValidationError } from "./errors/http";
 export * from "./router";
 export * from "./types";
 export * from "./client";
 export * from "./operators/http";
-import {
-  getRelativeRuntimePath,
-  HANDLER_WITH_META,
-  isWithMetaHandler,
-  createStorage,
-  registerPaths
-} from "./utils";
-export {
-  Api,
-  HANDLER_WITH_META,
-  HttpError,
-  ValidationError,
-  createStorage,
-  getRelativeRuntimePath,
-  isWithMetaHandler,
-  registerPaths
-};
+export { getRelativeRuntimePath, HANDLER_WITH_META, isWithMetaHandler, createStorage, registerPaths } from "./utils";