@modern-js/plugin-bff 1.5.2 → 1.5.3-beta.0

package/dist/js/modern/loader.js

@@ -1,4 +1,4 @@
-import { generateClient } from '@modern-js/bff-utils';
+import { generateClient } from '@modern-js/bff-core';
 
 async function loader(source) {
   // eslint-disable-next-line @babel/no-invalid-this

package/dist/js/modern/server.js

@@ -1,7 +1,11 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 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; }
 
 import path from 'path';
-import { injectAPIHandlerInfos } from '@modern-js/bff-utils';
+import { ApiRouter } from '@modern-js/bff-core';
 import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
 import { API_APP_NAME } from "./constants";
 
@@ -68,7 +72,15 @@ export default (() => ({
           prefix
         } = props;
         const apiDir = path.resolve(pwd, API_DIR);
-        injectAPIHandlerInfos(apiDir, prefix);
+        const appContext = api.useAppContext();
+        const apiRouter = new ApiRouter({
+          apiDir,
+          prefix
+        });
+        const apiHandlerInfos = apiRouter.getApiHandlers();
+        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+          apiHandlerInfos
+        }));
         return next(props);
       }
 

package/dist/js/node/loader.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _bffUtils = require("@modern-js/bff-utils");
+var _bffCore = require("@modern-js/bff-core");
 
 async function loader(source) {
   // eslint-disable-next-line @babel/no-invalid-this
@@ -33,7 +33,7 @@ async function loader(source) {
   }
 
   options.requireResolve = require.resolve;
-  const result = await (0, _bffUtils.generateClient)(options);
+  const result = await (0, _bffCore.generateClient)(options);
 
   if (result.isOk) {
     callback(undefined, result.value);

package/dist/js/node/server.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _bffUtils = require("@modern-js/bff-utils");
+var _bffCore = require("@modern-js/bff-core");
 
 var _utils = require("@modern-js/utils");
 
@@ -15,6 +15,10 @@ var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 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; }
 
 class Storage {
@@ -84,7 +88,15 @@ var _default = () => ({
 
         const apiDir = _path.default.resolve(pwd, _utils.API_DIR);
 
-        (0, _bffUtils.injectAPIHandlerInfos)(apiDir, prefix);
+        const appContext = api.useAppContext();
+        const apiRouter = new _bffCore.ApiRouter({
+          apiDir,
+          prefix
+        });
+        const apiHandlerInfos = apiRouter.getApiHandlers();
+        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+          apiHandlerInfos
+        }));
         return next(props);
       }
 

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.2",
+  "version": "1.5.3-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -53,12 +53,12 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.18.0",
-    "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "^1.2.6",
-    "@modern-js/bff-utils": "^1.2.9",
-    "@modern-js/create-request": "^1.2.11",
-    "@modern-js/server-utils": "^1.2.10",
+    "@babel/core": "^7.17.0",
+    "@babel/runtime": "^7",
+    "@modern-js/babel-compiler": "^1.2.5",
+    "@modern-js/bff-core": "^1.0.0",
+    "@modern-js/create-request": "^1.2.10",
+    "@modern-js/server-utils": "^1.2.9",
     "@modern-js/utils": "^1.7.6"
   },
   "devDependencies": {
@@ -82,7 +82,8 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "wireit": {
     "build": {