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

package/dist/js/modern/utils/alias.js

@@ -1,76 +1,91 @@
-import * as path from "path";
-import * as os from "os";
-import fs from "fs";
-import Module from "module";
-const getRelativeRuntimePath = (appDirectory, serverRuntimePath) => {
-  let relativeRuntimePath = "";
-  if (os.platform() === "win32") {
-    relativeRuntimePath = `../${path.relative(
-      appDirectory,
-      serverRuntimePath
-    )}`;
+import * as path from 'path';
+import * as os from 'os';
+import fs from 'fs';
+import Module from 'module';
+export const getRelativeRuntimePath = (appDirectory, serverRuntimePath) => {
+  let relativeRuntimePath = '';
+
+  if (os.platform() === 'win32') {
+    // isRelative function in babel-plugin-resolver plugin can't handle windows relative path correctly, see babel-plugin-resolver's utils.
+    relativeRuntimePath = `../${path.relative(appDirectory, serverRuntimePath)}`;
   } else {
-    relativeRuntimePath = path.join(
-      "../",
-      path.relative(appDirectory, serverRuntimePath)
-    );
+    // Look up one level, because the artifacts after build have dist directories
+    relativeRuntimePath = path.join('../', path.relative(appDirectory, serverRuntimePath));
   }
-  if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
+
+  if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
     relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
   }
+
   return relativeRuntimePath;
 };
-const sortByLongestPrefix = (arr) => {
+
+const sortByLongestPrefix = arr => {
   return arr.concat().sort((a, b) => b.length - a.length);
 };
-const createMatchPath = (paths) => {
+
+export const createMatchPath = paths => {
   const sortedKeys = sortByLongestPrefix(Object.keys(paths));
   const sortedPaths = {};
-  sortedKeys.forEach((key) => {
+  sortedKeys.forEach(key => {
     sortedPaths[key] = paths[key];
   });
-  return (request) => {
-    const found = Object.keys(sortedPaths).find((key) => {
+  return request => {
+    const found = Object.keys(sortedPaths).find(key => {
       return request.startsWith(key);
     });
+
     if (found) {
       let foundPaths = sortedPaths[found];
+
       if (!Array.isArray(foundPaths)) {
         foundPaths = [foundPaths];
       }
-      foundPaths = foundPaths.filter((foundPath) => path.isAbsolute(foundPath));
+
+      foundPaths = foundPaths.filter(foundPath => path.isAbsolute(foundPath));
+
       for (const p of foundPaths) {
         const foundPath = request.replace(found, p);
+
         if (fs.existsSync(foundPath)) {
           return foundPath;
         }
       }
+
       return request.replace(found, foundPaths[0]);
     }
+
     return null;
   };
-};
-const registerPaths = (paths) => {
-  const originalResolveFilename = Module._resolveFilename;
-  const { builtinModules } = Module;
+}; // every path must be a absolute path;
+
+export const registerPaths = paths => {
+  const originalResolveFilename = Module._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
+
+  const {
+    builtinModules
+  } = Module;
   const matchPath = createMatchPath(paths);
-  Module._resolveFilename = function(request, _parent) {
+
+  Module._resolveFilename = function (request, _parent) {
     const isCoreModule = builtinModules.includes(request);
+
     if (!isCoreModule) {
       const matched = matchPath(request);
+
       if (matched) {
-        const modifiedArguments = [matched, ...[].slice.call(arguments, 1)];
+        // eslint-disable-next-line prefer-rest-params
+        const modifiedArguments = [matched, ...[].slice.call(arguments, 1)]; // Passes all arguments. Even those that is not specified above.
+
         return originalResolveFilename.apply(this, modifiedArguments);
       }
-    }
+    } // eslint-disable-next-line prefer-rest-params
+
+
     return originalResolveFilename.apply(this, arguments);
   };
+
   return () => {
     Module._resolveFilename = originalResolveFilename;
   };
-};
-export {
-  createMatchPath,
-  getRelativeRuntimePath,
-  registerPaths
-};
+};

package/dist/js/modern/utils/debug.js

@@ -1,5 +1,2 @@
-import { createDebugger } from "@modern-js/utils";
-const debug = createDebugger("bff");
-export {
-  debug
-};
+import { createDebugger } from '@modern-js/utils';
+export const debug = createDebugger('bff');

package/dist/js/modern/utils/index.js

@@ -1,8 +1,5 @@
 export * from "./storage";
 export * from "./alias";
-import { debug } from "./debug";
+export { debug } from "./debug";
 export * from "./meta";
-export * from "./validate";
-export {
-  debug
-};
+export * from "./validate";

package/dist/js/modern/utils/meta.js

@@ -1,8 +1,4 @@
-const HANDLER_WITH_META = "HANDLER_WITH_META";
-const isWithMetaHandler = (handler) => {
-  return typeof handler === "function" && handler[HANDLER_WITH_META];
-};
-export {
-  HANDLER_WITH_META,
-  isWithMetaHandler
-};
+export const HANDLER_WITH_META = 'HANDLER_WITH_META';
+export const isWithMetaHandler = handler => {
+  return typeof handler === 'function' && handler[HANDLER_WITH_META];
+};

package/dist/js/modern/utils/storage.js

@@ -1,14 +1,18 @@
-import * as ah from "async_hooks";
+import * as ah from 'async_hooks';
+
 const createStorage = () => {
   let storage;
-  if (typeof ah.AsyncLocalStorage !== "undefined") {
+
+  if (typeof ah.AsyncLocalStorage !== 'undefined') {
     storage = new ah.AsyncLocalStorage();
   }
+
   const run = (context, cb) => {
     if (!storage) {
       throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
         `);
     }
+
     return new Promise((resolve, reject) => {
       storage.run(context, () => {
         try {
@@ -19,24 +23,26 @@ const createStorage = () => {
       });
     });
   };
+
   const useContext = () => {
     if (!storage) {
       throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
         `);
     }
+
     const context = storage.getStore();
+
     if (!context) {
-      throw new Error(
-        `Can't call useContext out of scope, it should be placed in the bff function`
-      );
+      throw new Error(`Can't call useContext out of scope, it should be placed in the bff function`);
     }
+
     return context;
   };
+
   return {
     run,
     useContext
   };
 };
-export {
-  createStorage
-};
+
+export { createStorage };

package/dist/js/modern/utils/validate.js

@@ -1,43 +1,49 @@
-import util from "util";
-const getTypeErrorMessage = (actual) => {
-  var _a;
-  let msg = "";
+import util from 'util'; // fork from https://github.com/nodejs/node/blob/master/lib/internal/errors.js
+
+export const getTypeErrorMessage = actual => {
+  let msg = '';
+
   if (actual == null) {
     msg += `. Received ${actual}`;
-  } else if (typeof actual === "function" && actual.name) {
+  } else if (typeof actual === 'function' && actual.name) {
     msg += `. Received function ${actual.name}`;
-  } else if (typeof actual === "object") {
-    if ((_a = actual.constructor) == null ? void 0 : _a.name) {
+  } else if (typeof actual === 'object') {
+    var _actual$constructor;
+
+    if ((_actual$constructor = actual.constructor) !== null && _actual$constructor !== void 0 && _actual$constructor.name) {
       msg += `. Received an instance of ${actual.constructor.name}`;
     } else {
-      const inspected = util.inspect(actual, { depth: -1 });
+      const inspected = util.inspect(actual, {
+        depth: -1
+      });
       msg += `. Received ${inspected}`;
     }
   } else {
-    let inspected = util.inspect(actual, { colors: false });
+    let inspected = util.inspect(actual, {
+      colors: false
+    });
+
     if (inspected.length > 25) {
       inspected = `${inspected.slice(0, 25)}...`;
     }
+
     msg += `. Received type ${typeof actual} (${inspected})`;
   }
+
   return msg;
-};
-class ERR_INVALID_ARG_TYPE extends Error {
+}; // eslint-disable-next-line @typescript-eslint/naming-convention
+
+export class ERR_INVALID_ARG_TYPE extends Error {
   constructor(funcName, expectedType, actual) {
-    const message = `[ERR_INVALID_ARG_TYPE]: The '${funcName}' argument must be of type ${expectedType}${getTypeErrorMessage(
-      actual
-    )}`;
+    const message = `[ERR_INVALID_ARG_TYPE]: The '${funcName}' argument must be of type ${expectedType}${getTypeErrorMessage(actual)}`;
     super(message);
   }
+
 }
-const validateFunction = (maybeFunc, name) => {
-  if (typeof maybeFunc !== "function") {
-    throw new ERR_INVALID_ARG_TYPE(name, "function", maybeFunc);
+export const validateFunction = (maybeFunc, name) => {
+  if (typeof maybeFunc !== 'function') {
+    throw new ERR_INVALID_ARG_TYPE(name, 'function', maybeFunc);
   }
+
   return true;
-};
-export {
-  ERR_INVALID_ARG_TYPE,
-  getTypeErrorMessage,
-  validateFunction
-};
+};

package/dist/js/node/api.js

@@ -1,98 +1,66 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
-var api_exports = {};
-__export(api_exports, {
-  Api: () => Api
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(api_exports);
-var import_reflect_metadata = require("reflect-metadata");
-var import_koa_compose = __toESM(require("koa-compose"));
-var import_utils = require("./utils");
+exports.Api = Api;
+
+require("reflect-metadata");
+
+var _koaCompose = _interopRequireDefault(require("koa-compose"));
+
+var _utils = require("./utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function Api(...args) {
   const handler = args.pop();
-  (0, import_utils.validateFunction)(handler, "Apihandler");
+  (0, _utils.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 (0, import_koa_compose.default)(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 (0, _koaCompose.default)(stack)(executeHelper);
+    return executeHelper.result;
   }
-  runner[import_utils.HANDLER_WITH_META] = true;
+
+  runner[_utils.HANDLER_WITH_META] = true;
   return runner;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Api
-});
+}

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

@@ -1,57 +1,24 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
-var generate_client_exports = {};
-__export(generate_client_exports, {
-  DEFAULT_CLIENT_REQUEST_CREATOR: () => DEFAULT_CLIENT_REQUEST_CREATOR,
-  generateClient: () => generateClient
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(generate_client_exports);
-var path = __toESM(require("path"));
-var import_router = require("../router");
-var import_result = require("./result");
-const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-const generateClient = (_0) => __async(void 0, [_0], function* ({
+exports.generateClient = exports.DEFAULT_CLIENT_REQUEST_CREATOR = void 0;
+
+var path = _interopRequireWildcard(require("path"));
+
+var _router = require("../router");
+
+var _result = require("./result");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const DEFAULT_CLIENT_REQUEST_CREATOR = '@modern-js/create-request';
+exports.DEFAULT_CLIENT_REQUEST_CREATOR = DEFAULT_CLIENT_REQUEST_CREATOR;
+
+const generateClient = async ({
   resourcePath,
   apiDir,
   prefix,
@@ -59,53 +26,56 @@ 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 import_router.ApiRouter({
+
+  const apiRouter = new _router.ApiRouter({
     apiDir,
     prefix
   });
   const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
+
   if (!handlerInfos) {
-    return (0, import_result.Err)(`generate client error: Cannot require module ${resourcePath}`);
+    return (0, _result.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 (0, import_result.Ok)(`${importCode}
-${handlersCode}`);
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DEFAULT_CLIENT_REQUEST_CREATOR,
-  generateClient
-});
+${fetcher ? `import { fetch } from '${fetcher}';\n` : ''}`;
+  return (0, _result.Ok)(`${importCode}\n${handlersCode}`);
+};
+
+exports.generateClient = generateClient;

package/dist/js/node/client/index.js

@@ -1,17 +1,18 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-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);
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _generateClient = require("./generate-client");
+
+Object.keys(_generateClient).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _generateClient[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _generateClient[key];
+    }
+  });
+});