@modern-js/bff-core 1.21.6 → 1.21.7-beta.0

package/dist/js/node/utils/alias.js

@@ -4,24 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerPaths = exports.getRelativeRuntimePath = exports.createMatchPath = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var os = _interopRequireWildcard(require("os"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _module = _interopRequireDefault(require("module"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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)}`;
@@ -29,20 +20,15 @@ const getRelativeRuntimePath = (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') {
     relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
   }
-
   return relativeRuntimePath;
 };
-
 exports.getRelativeRuntimePath = getRelativeRuntimePath;
-
 const sortByLongestPrefix = arr => {
   return arr.concat().sort((a, b) => b.length - a.length);
 };
-
 const createMatchPath = paths => {
   const sortedKeys = sortByLongestPrefix(Object.keys(paths));
   const sortedPaths = {};
@@ -53,63 +39,48 @@ const createMatchPath = paths => {
     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));
-
       for (const p of foundPaths) {
         const foundPath = request.replace(found, p);
-
         if (_fs.default.existsSync(foundPath)) {
           return foundPath;
         }
       }
-
       return request.replace(found, foundPaths[0]);
     }
-
     return null;
   };
-}; // every path must be a absolute path;
-
+};
 
+// every path must be a absolute path;
 exports.createMatchPath = createMatchPath;
-
 const registerPaths = paths => {
-  const originalResolveFilename = _module.default._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
-
+  const originalResolveFilename = _module.default._resolveFilename;
+  // eslint-disable-next-line node/no-unsupported-features/node-builtins
   const {
     builtinModules
   } = _module.default;
   const matchPath = createMatchPath(paths);
-
   _module.default._resolveFilename = function (request, _parent) {
     const isCoreModule = builtinModules.includes(request);
-
     if (!isCoreModule) {
       const matched = matchPath(request);
-
       if (matched) {
         // 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
-
-
+    }
+    // eslint-disable-next-line prefer-rest-params
     return originalResolveFilename.apply(this, arguments);
   };
-
   return () => {
     _module.default._resolveFilename = originalResolveFilename;
   };
 };
-
 exports.registerPaths = registerPaths;

package/dist/js/node/utils/debug.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.debug = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const debug = (0, _utils.createDebugger)('bff');
 exports.debug = debug;

package/dist/js/node/utils/index.js

@@ -12,9 +12,7 @@ Object.defineProperty(exports, "debug", {
     return _debug.debug;
   }
 });
-
 var _storage = require("./storage");
-
 Object.keys(_storage).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -26,9 +24,7 @@ Object.keys(_storage).forEach(function (key) {
     }
   });
 });
-
 var _alias = require("./alias");
-
 Object.keys(_alias).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -40,11 +36,8 @@ Object.keys(_alias).forEach(function (key) {
     }
   });
 });
-
 var _debug = require("./debug");
-
 var _meta = require("./meta");
-
 Object.keys(_meta).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -56,9 +49,7 @@ Object.keys(_meta).forEach(function (key) {
     }
   });
 });
-
 var _validate = require("./validate");
-
 Object.keys(_validate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;

package/dist/js/node/utils/meta.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.isWithMetaHandler = exports.HANDLER_WITH_META = void 0;
 const HANDLER_WITH_META = 'HANDLER_WITH_META';
 exports.HANDLER_WITH_META = HANDLER_WITH_META;
-
 const isWithMetaHandler = handler => {
   return typeof handler === 'function' && handler[HANDLER_WITH_META];
 };
-
 exports.isWithMetaHandler = isWithMetaHandler;

package/dist/js/node/utils/storage.js

@@ -4,26 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createStorage = void 0;
-
 var ah = _interopRequireWildcard(require("async_hooks"));
-
 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 createStorage = () => {
   let storage;
-
   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 {
@@ -34,26 +27,20 @@ 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`);
     }
-
     return context;
   };
-
   return {
     run,
     useContext
   };
 };
-
 exports.createStorage = createStorage;

package/dist/js/node/utils/validate.js

@@ -4,65 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateFunction = exports.getTypeErrorMessage = exports.ERR_INVALID_ARG_TYPE = void 0;
-
 var _util = _interopRequireDefault(require("util"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // fork from https://github.com/nodejs/node/blob/master/lib/internal/errors.js
 const getTypeErrorMessage = actual => {
   let msg = '';
-
   if (actual == null) {
     msg += `. Received ${actual}`;
   } else if (typeof actual === 'function' && actual.name) {
     msg += `. Received function ${actual.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.default.inspect(actual, {
         depth: -1
       });
-
       msg += `. Received ${inspected}`;
     }
   } else {
     let inspected = _util.default.inspect(actual, {
       colors: false
     });
-
     if (inspected.length > 25) {
       inspected = `${inspected.slice(0, 25)}...`;
     }
-
     msg += `. Received type ${typeof actual} (${inspected})`;
   }
-
   return msg;
-}; // eslint-disable-next-line @typescript-eslint/naming-convention
-
+};
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 exports.getTypeErrorMessage = getTypeErrorMessage;
-
 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)}`;
     super(message);
   }
-
 }
-
 exports.ERR_INVALID_ARG_TYPE = ERR_INVALID_ARG_TYPE;
-
 const validateFunction = (maybeFunc, name) => {
   if (typeof maybeFunc !== 'function') {
     throw new ERR_INVALID_ARG_TYPE(name, 'function', maybeFunc);
   }
-
   return true;
 };
-
 exports.validateFunction = validateFunction;

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

@@ -4,7 +4,6 @@ export declare enum APIMode {
    * 框架模式
    */
   FARMEWORK = "framework",
-
   /**
    * 函数模式
    */

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

@@ -36,7 +36,6 @@ export declare class ApiRouter {
    * 如果用户未传入或传入空串，默认为 /api
    * 如果传入 /，则 prefix 为 /
    */
-
   private initPrefix;
   private validateAbsolute;
   private getExactApiMode;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.6",
+  "version": "1.21.7-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -26,23 +26,23 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "esbuild": "^0.14.38",
+    "@modern-js/bff-runtime": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2",
+    "esbuild": "0.15.7",
     "esbuild-register": "^3.3.3",
     "koa-compose": "^4.1.0",
-    "reflect-metadata": "^0.1.13",
-    "@modern-js/bff-runtime": "1.21.6",
-    "@modern-js/utils": "1.21.6"
+    "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2",
     "@types/jest": "^27",
     "@types/koa-compose": "^3.2.5",
     "@types/node": "^14",
     "jest": "^27",
-    "type-fest": "^2.13.0",
+    "type-fest": "2.15.0",
     "typescript": "^4",
-    "zod": "^3.17.3",
-    "@scripts/build": "1.21.6",
-    "@scripts/jest-config": "1.21.6"
+    "zod": "^3.17.3"
   },
   "peerDependencies": {
     "zod": "^3.17.3"
@@ -61,32 +61,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
-    "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "new": "modern-lib new",
+    "build": "modern-lib build",
+    "test": "jest --passWithNoTests"
   }
 }