@modern-js/plugin-koa 1.4.3 → 1.4.6

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @modern-js/plugin-koa
 
+## 1.4.6
+
+### Patch Changes
+
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- befd9e5b: fix: compatible with babel-plugin-resolver's handling of relative paths on windows
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [befd9e5b]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/adapter-helpers@1.2.3
+  - @modern-js/bff-runtime@1.2.2
+  - @modern-js/bff-utils@1.2.3
+
+## 1.4.5
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- Updated dependencies [132f7b53]
+  - @modern-js/utils@1.3.7
+
+## 1.4.4
+
+### Patch Changes
+
+- 952432ac: fix: upload files
+- c1b8fa0a: feat: convert to new server plugin
+- Updated dependencies [c2046f37]
+  - @modern-js/utils@1.3.6
+
 ## 1.4.3
 
 ### Patch Changes

package/dist/js/modern/cli/index.js

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import { createRuntimeExportsUtils } from '@modern-js/utils';
+import { getRelativeRuntimePath } from '@modern-js/adapter-helpers';
 export default (() => ({
   name: '@modern-js/plugin-koa',
   setup: api => {
@@ -16,14 +17,8 @@ export default (() => ({
           appDirectory
         } = appContext;
         bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'server');
-        const serverRuntimePath = bffExportsUtils.getPath(); // Look up one level, because the artifacts after build have dist directories
-
-        let relativeRuntimePath = path.join('../', path.relative(appDirectory, serverRuntimePath));
-
-        if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
-          relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
-        }
-
+        const serverRuntimePath = bffExportsUtils.getPath();
+        const relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
         return {
           source: {
             alias: {

package/dist/js/modern/index.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line filenames/match-exported
 import plugin from "./plugin";
 export * from "./context";
 export default plugin;

package/dist/js/modern/plugin.js

@@ -2,7 +2,6 @@ import * as path from 'path';
 import Koa from 'koa';
 import Router from 'koa-router';
 import koaBody from 'koa-body';
-import { createPlugin } from '@modern-js/server-core';
 import { requireModule } from '@modern-js/bff-utils';
 import { fs } from '@modern-js/utils';
 import { run } from "./context";
@@ -28,37 +27,85 @@ const initMiddlewares = (middleware, app) => {
   });
 };
 
-export default createPlugin(() => ({
-  // eslint-disable-next-line max-statements
-  async prepareApiServer({
-    pwd,
-    mode,
-    config,
-    prefix
-  }) {
-    let app;
-    const router = new Router();
-    const apiDir = path.join(pwd, './api');
-
-    if (mode === 'framework') {
-      app = await findAppModule(apiDir);
-
-      if (!(app instanceof Koa)) {
+export default (() => ({
+  name: '@modern-js/plugin-koa',
+  pre: ['@modern-js/plugin-bff'],
+  setup: () => ({
+    async prepareApiServer({
+      pwd,
+      mode,
+      config,
+      prefix
+    }) {
+      let app;
+      const router = new Router();
+      const apiDir = path.join(pwd, './api');
+
+      if (mode === 'framework') {
+        app = await findAppModule(apiDir);
+
+        if (!(app instanceof Koa)) {
+          app = new Koa();
+          app.use(koaBody({
+            multipart: true
+          }));
+        }
+
+        if (config) {
+          const {
+            middleware
+          } = config;
+          initMiddlewares(middleware, app);
+        }
+
+        app.use(run);
+        registerRoutes(router, prefix);
+      } else if (mode === 'function') {
         app = new Koa();
-        app.use(koaBody());
-      }
+        app.use(koaBody({
+          multipart: true
+        }));
+
+        if (config) {
+          const {
+            middleware
+          } = config;
+          initMiddlewares(middleware, app);
+        }
 
-      if (config) {
-        const {
-          middleware
-        } = config;
-        initMiddlewares(middleware, app);
+        app.use(run);
+        registerRoutes(router, prefix);
+      } else {
+        throw new Error(`mode must be function or framework`);
       }
 
-      app.use(run);
-      registerRoutes(router, prefix);
-    } else if (mode === 'function') {
-      app = new Koa();
+      app.use(router.routes());
+      return (req, res) => {
+        app.on('error', err => {
+          if (err) {
+            throw err;
+          }
+        });
+        return Promise.resolve(app.callback()(req, res));
+      };
+    },
+
+    prepareWebServer({
+      config
+    }) {
+      const app = new Koa();
+      app.use(async (ctx, next) => {
+        await next();
+
+        if (!ctx.body) {
+          // restore statusCode
+          if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
+            ctx.res.statusCode = 200;
+          }
+
+          ctx.respond = false;
+        }
+      });
       app.use(koaBody());
 
       if (config) {
@@ -68,59 +115,15 @@ export default createPlugin(() => ({
         initMiddlewares(middleware, app);
       }
 
-      app.use(run);
-      registerRoutes(router, prefix);
-    } else {
-      throw new Error(`mode must be function or framework`);
+      return (req, res) => {
+        app.on('error', err => {
+          if (err) {
+            throw err;
+          }
+        });
+        return Promise.resolve(app.callback()(req, res));
+      };
     }
 
-    app.use(router.routes());
-    return (req, res) => {
-      app.on('error', err => {
-        if (err) {
-          throw err;
-        }
-      });
-      return Promise.resolve(app.callback()(req, res));
-    };
-  },
-
-  prepareWebServer({
-    config
-  }) {
-    const app = new Koa();
-    app.use(async (ctx, next) => {
-      await next();
-
-      if (!ctx.body) {
-        // restore statusCode
-        if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
-          ctx.res.statusCode = 200;
-        }
-
-        ctx.respond = false;
-      }
-    });
-    app.use(koaBody());
-
-    if (config) {
-      const {
-        middleware
-      } = config;
-      initMiddlewares(middleware, app);
-    }
-
-    return (req, res) => {
-      app.on('error', err => {
-        if (err) {
-          throw err;
-        }
-      });
-      return Promise.resolve(app.callback()(req, res));
-    };
-  }
-
-}), {
-  name: '@modern-js/plugin-koa',
-  pre: ['@modern-js/plugin-bff']
-});
+  })
+}));

package/dist/js/modern/registerRoutes.js

@@ -1,13 +1,6 @@
-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 { HttpMethod, useAPIHandlerInfos } from '@modern-js/bff-utils';
 import { isSchemaHandler } from '@modern-js/bff-runtime';
 import typeIs from 'type-is';
-import formidable from 'formidable';
 import { sortDynamicRoutes } from '@modern-js/adapter-helpers';
 import { createDebugger } from '@modern-js/utils';
 const debug = createDebugger('koa');
@@ -35,25 +28,18 @@ const registerRoutes = (router, prefix) => {
 
         if (result.type !== 'HandleSuccess') {
           if (result.type === 'InputValidationError') {
-            // eslint-disable-next-line require-atomic-updates
             ctx.status = 400;
           } else {
-            // eslint-disable-next-line require-atomic-updates
             ctx.status = 500;
-          } // eslint-disable-next-line require-atomic-updates
-
+          }
 
           ctx.body = result.message;
         } else {
-          // eslint-disable-next-line require-atomic-updates
           ctx.body = result.value;
         }
       } else {
-        const args = Object.values(input.params).concat(input); // eslint-disable-next-line require-atomic-updates
-
-        ctx.type = 'json'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        const args = Object.values(input.params).concat(input); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-        // eslint-disable-next-line require-atomic-updates
 
         ctx.body = await handler(...args);
       }
@@ -85,7 +71,7 @@ const getInputFromRequest = async ctx => {
   if (typeIs.is(ctx.request.type, ['application/json'])) {
     draft.data = ctx.request.body;
   } else if (typeIs.is(ctx.request.type, ['multipart/form-data'])) {
-    draft.formData = await resvoleFormData(ctx);
+    draft.formData = ctx.request.files;
   } else if (typeIs.is(ctx.request.type, ['application/x-www-form-urlencoded'])) {
     draft.formUrlencoded = ctx.request.body;
   } else {
@@ -93,19 +79,4 @@ const getInputFromRequest = async ctx => {
   }
 
   return draft;
-};
-
-const resvoleFormData = ctx => {
-  const form = formidable({
-    multiples: true
-  });
-  return new Promise((resolve, reject) => {
-    form.parse(ctx.req, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      resolve(_objectSpread(_objectSpread({}, fields), files));
-    });
-  });
 };

package/dist/js/node/cli/index.js

@@ -9,6 +9,8 @@ var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
 
+var _adapterHelpers = require("@modern-js/adapter-helpers");
+
 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; }
@@ -29,14 +31,8 @@ var _default = () => ({
           appDirectory
         } = appContext;
         bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'server');
-        const serverRuntimePath = bffExportsUtils.getPath(); // Look up one level, because the artifacts after build have dist directories
-
-        let relativeRuntimePath = path.join('../', path.relative(appDirectory, serverRuntimePath));
-
-        if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
-          relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
-        }
-
+        const serverRuntimePath = bffExportsUtils.getPath();
+        const relativeRuntimePath = (0, _adapterHelpers.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
         return {
           source: {
             alias: {

package/dist/js/node/index.js

@@ -24,6 +24,5 @@ Object.keys(_context).forEach(function (key) {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// eslint-disable-next-line filenames/match-exported
 var _default = _plugin.default;
 exports.default = _default;

package/dist/js/node/plugin.js

@@ -13,8 +13,6 @@ var _koaRouter = _interopRequireDefault(require("koa-router"));
 
 var _koaBody = _interopRequireDefault(require("koa-body"));
 
-var _serverCore = require("@modern-js/server-core");
-
 var _bffUtils = require("@modern-js/bff-utils");
 
 var _utils = require("@modern-js/utils");
@@ -49,37 +47,85 @@ const initMiddlewares = (middleware, app) => {
   });
 };
 
-var _default = (0, _serverCore.createPlugin)(() => ({
-  // eslint-disable-next-line max-statements
-  async prepareApiServer({
-    pwd,
-    mode,
-    config,
-    prefix
-  }) {
-    let app;
-    const router = new _koaRouter.default();
-    const apiDir = path.join(pwd, './api');
-
-    if (mode === 'framework') {
-      app = await findAppModule(apiDir);
-
-      if (!(app instanceof _koa.default)) {
+var _default = () => ({
+  name: '@modern-js/plugin-koa',
+  pre: ['@modern-js/plugin-bff'],
+  setup: () => ({
+    async prepareApiServer({
+      pwd,
+      mode,
+      config,
+      prefix
+    }) {
+      let app;
+      const router = new _koaRouter.default();
+      const apiDir = path.join(pwd, './api');
+
+      if (mode === 'framework') {
+        app = await findAppModule(apiDir);
+
+        if (!(app instanceof _koa.default)) {
+          app = new _koa.default();
+          app.use((0, _koaBody.default)({
+            multipart: true
+          }));
+        }
+
+        if (config) {
+          const {
+            middleware
+          } = config;
+          initMiddlewares(middleware, app);
+        }
+
+        app.use(_context.run);
+        (0, _registerRoutes.default)(router, prefix);
+      } else if (mode === 'function') {
         app = new _koa.default();
-        app.use((0, _koaBody.default)());
-      }
+        app.use((0, _koaBody.default)({
+          multipart: true
+        }));
+
+        if (config) {
+          const {
+            middleware
+          } = config;
+          initMiddlewares(middleware, app);
+        }
 
-      if (config) {
-        const {
-          middleware
-        } = config;
-        initMiddlewares(middleware, app);
+        app.use(_context.run);
+        (0, _registerRoutes.default)(router, prefix);
+      } else {
+        throw new Error(`mode must be function or framework`);
       }
 
-      app.use(_context.run);
-      (0, _registerRoutes.default)(router, prefix);
-    } else if (mode === 'function') {
-      app = new _koa.default();
+      app.use(router.routes());
+      return (req, res) => {
+        app.on('error', err => {
+          if (err) {
+            throw err;
+          }
+        });
+        return Promise.resolve(app.callback()(req, res));
+      };
+    },
+
+    prepareWebServer({
+      config
+    }) {
+      const app = new _koa.default();
+      app.use(async (ctx, next) => {
+        await next();
+
+        if (!ctx.body) {
+          // restore statusCode
+          if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
+            ctx.res.statusCode = 200;
+          }
+
+          ctx.respond = false;
+        }
+      });
       app.use((0, _koaBody.default)());
 
       if (config) {
@@ -89,61 +135,17 @@ var _default = (0, _serverCore.createPlugin)(() => ({
         initMiddlewares(middleware, app);
       }
 
-      app.use(_context.run);
-      (0, _registerRoutes.default)(router, prefix);
-    } else {
-      throw new Error(`mode must be function or framework`);
+      return (req, res) => {
+        app.on('error', err => {
+          if (err) {
+            throw err;
+          }
+        });
+        return Promise.resolve(app.callback()(req, res));
+      };
     }
 
-    app.use(router.routes());
-    return (req, res) => {
-      app.on('error', err => {
-        if (err) {
-          throw err;
-        }
-      });
-      return Promise.resolve(app.callback()(req, res));
-    };
-  },
-
-  prepareWebServer({
-    config
-  }) {
-    const app = new _koa.default();
-    app.use(async (ctx, next) => {
-      await next();
-
-      if (!ctx.body) {
-        // restore statusCode
-        if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
-          ctx.res.statusCode = 200;
-        }
-
-        ctx.respond = false;
-      }
-    });
-    app.use((0, _koaBody.default)());
-
-    if (config) {
-      const {
-        middleware
-      } = config;
-      initMiddlewares(middleware, app);
-    }
-
-    return (req, res) => {
-      app.on('error', err => {
-        if (err) {
-          throw err;
-        }
-      });
-      return Promise.resolve(app.callback()(req, res));
-    };
-  }
-
-}), {
-  name: '@modern-js/plugin-koa',
-  pre: ['@modern-js/plugin-bff']
+  })
 });
 
 exports.default = _default;

package/dist/js/node/registerRoutes.js

@@ -11,20 +11,12 @@ var _bffRuntime = require("@modern-js/bff-runtime");
 
 var _typeIs = _interopRequireDefault(require("type-is"));
 
-var _formidable = _interopRequireDefault(require("formidable"));
-
 var _adapterHelpers = require("@modern-js/adapter-helpers");
 
 var _utils = require("@modern-js/utils");
 
 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; }
-
 const debug = (0, _utils.createDebugger)('koa');
 
 const registerRoutes = (router, prefix) => {
@@ -50,25 +42,18 @@ const registerRoutes = (router, prefix) => {
 
         if (result.type !== 'HandleSuccess') {
           if (result.type === 'InputValidationError') {
-            // eslint-disable-next-line require-atomic-updates
             ctx.status = 400;
           } else {
-            // eslint-disable-next-line require-atomic-updates
             ctx.status = 500;
-          } // eslint-disable-next-line require-atomic-updates
-
+          }
 
           ctx.body = result.message;
         } else {
-          // eslint-disable-next-line require-atomic-updates
           ctx.body = result.value;
         }
       } else {
-        const args = Object.values(input.params).concat(input); // eslint-disable-next-line require-atomic-updates
-
-        ctx.type = 'json'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        const args = Object.values(input.params).concat(input); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-        // eslint-disable-next-line require-atomic-updates
 
         ctx.body = await handler(...args);
       }
@@ -101,7 +86,7 @@ const getInputFromRequest = async ctx => {
   if (_typeIs.default.is(ctx.request.type, ['application/json'])) {
     draft.data = ctx.request.body;
   } else if (_typeIs.default.is(ctx.request.type, ['multipart/form-data'])) {
-    draft.formData = await resvoleFormData(ctx);
+    draft.formData = ctx.request.files;
   } else if (_typeIs.default.is(ctx.request.type, ['application/x-www-form-urlencoded'])) {
     draft.formUrlencoded = ctx.request.body;
   } else {
@@ -109,19 +94,4 @@ const getInputFromRequest = async ctx => {
   }
 
   return draft;
-};
-
-const resvoleFormData = ctx => {
-  const form = (0, _formidable.default)({
-    multiples: true
-  });
-  return new Promise((resolve, reject) => {
-    form.parse(ctx.req, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      resolve(_objectSpread(_objectSpread({}, fields), files));
-    });
-  });
 };

package/dist/types/plugin.d.ts

@@ -1,5 +1,6 @@
+import type { ServerPlugin } from '@modern-js/server-core';
 export declare type Mode = 'function' | 'framework';
 
-declare const _default: any;
+declare const _default: () => ServerPlugin;
 
 export default _default;

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.3",
+  "version": "1.4.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,31 +34,29 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.3",
-    "@modern-js/adapter-helpers": "^1.2.1",
-    "@modern-js/utils": "^1.3.5",
-    "formidable": "^1.2.2",
+    "@modern-js/adapter-helpers": "^1.2.3",
+    "@modern-js/bff-runtime": "^1.2.2",
+    "@modern-js/bff-utils": "^1.2.3",
+    "@modern-js/utils": "^1.5.0",
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
-    "type-is": "^1.6.18",
-    "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/server-core": "^1.2.3",
-    "@modern-js/bff-runtime": "^1.2.1"
+    "type-is": "^1.6.18"
   },
   "devDependencies": {
-    "koa": "^2.13.3",
-    "@types/formidable": "^1.2.3",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/jest": "^27.0.1",
     "@types/koa": "^2.13.4",
     "@types/koa-router": "^7.4.4",
     "@types/node": "^14",
     "@types/supertest": "^2.0.11",
     "@types/type-is": "^1.6.3",
-    "supertest": "^6.1.6",
-    "typescript": "^4",
-    "@scripts/build": "0.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0",
-    "@modern-js/core": "^1.5.0"
+    "@modern-js/server-core": "1.3.1",
+    "@modern-js/core": "1.8.0",
+    "supertest": "^6.1.6",
+    "koa": "^2.13.3",
+    "typescript": "^4"
   },
   "modernConfig": {
     "output": {

package/tests/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/tests/common.ts

@@ -1,9 +0,0 @@
-// globby needs setImmediate
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-global.setImmediate = setTimeout;
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-global.clearImmediate = clearTimeout;
-
-export const INTROSPECTION_ROUTE_PATH = '/__introspection__';

package/tests/fixtures/assets/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-</head>
-<body>
-  hello koa plugin
-</body>
-</html>

package/tests/fixtures/function-mode/api/hello.ts

@@ -1 +0,0 @@
-export const get = () => ({ message: 'hello koa' });

package/tests/fixtures/function-mode/api/nest/user.ts

@@ -1,33 +0,0 @@
-import { match } from '@modern-js/bff-runtime';
-import { useContext } from '../../../../../src/context';
-
-export const get = ({ query }: { query: Record<string, unknown> }) => ({
-  query,
-});
-
-export const post = ({ data }: { data: Record<string, unknown> }) => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const ctx = useContext();
-  const { cookies } = ctx;
-  return {
-    query: ctx.query,
-    data,
-    cookies: {
-      id: cookies.get('id'),
-      name: cookies.get('name'),
-    },
-  };
-};
-
-export const patch = match(
-  {
-    request: {
-      data: {
-        id: Number,
-        name: String,
-      },
-    },
-    response: { id: Number },
-  },
-  ({ data: { id } }) => ({ id }),
-);

package/tests/fixtures/lambda-mode/api/app.ts

@@ -1 +0,0 @@
-// used by the test, empty file

package/tests/fixtures/lambda-mode/api/lambda/hello.ts

@@ -1 +0,0 @@
-export const get = () => ({ message: 'hello koa' });

package/tests/fixtures/lambda-mode/api/lambda/nest/[id].ts

@@ -1 +0,0 @@
-export const post = (id: string) => ({ id });

package/tests/fixtures/lambda-mode/api/lambda/nest/user.ts

@@ -1,33 +0,0 @@
-import { match } from '@modern-js/bff-runtime';
-import { useContext } from '../../../../../../src/context';
-
-export const get = ({ query }: { query: Record<string, unknown> }) => ({
-  query,
-});
-
-export const post = ({ data }: { data: Record<string, unknown> }) => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const ctx = useContext();
-  const { cookies } = ctx;
-  return {
-    query: ctx.query,
-    data,
-    cookies: {
-      id: cookies.get('id'),
-      name: cookies.get('name'),
-    },
-  };
-};
-
-export const patch = match(
-  {
-    request: {
-      data: {
-        id: Number,
-        name: String,
-      },
-    },
-    response: { id: Number },
-  },
-  ({ data: { id } }) => ({ id }),
-);

package/tests/functionMode.test.ts

@@ -1,53 +0,0 @@
-import * as path from 'path';
-import request from 'supertest';
-import { serverManager } from '@modern-js/server-core';
-import plugin from '../src/plugin';
-import { APIPlugin } from './helpers';
-import './common';
-
-const pwd = path.join(__dirname, './fixtures/function-mode');
-
-describe('function-mode', () => {
-  const id = '666';
-  const name = 'foo';
-  const foo = { id, name };
-  let apiHandler: any;
-
-  beforeAll(async () => {
-    const runner = await serverManager
-      .clone()
-      .usePlugin(APIPlugin, plugin)
-      .init();
-    apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'function',
-    });
-  });
-
-  test('should works with body', async () => {
-    const res = await request(apiHandler).post('/nest/user').send(foo);
-    expect(res.status).toBe(200);
-    expect(res.body.data).toEqual(foo);
-  });
-
-  test('should works with schema', async () => {
-    const res = await request(apiHandler).patch('/nest/user').send({
-      id: 777,
-      name: 'xxx',
-    });
-    expect(res.status).toBe(200);
-    expect(res.body.id).toBe(777);
-
-    const res2 = await request(apiHandler).patch('/nest/user').send({
-      id: 'aaa',
-      name: 'xxx',
-    });
-    expect(res2.status).toBe(400);
-
-    const res3 = await request(apiHandler).patch('/nest/user').send({
-      id: '777',
-      name: 'xxx',
-    });
-    expect(res3.status).toBe(500);
-  });
-});

package/tests/helpers.ts

@@ -1,14 +0,0 @@
-import path from 'path';
-import { createPlugin } from '@modern-js/server-core';
-import { injectAPIHandlerInfos, API_DIR } from '@modern-js/bff-utils';
-
-export const APIPlugin = createPlugin(() => ({
-  prepareApiServer(props, next) {
-    const { pwd, prefix } = props;
-    const apiDir = path.resolve(pwd, API_DIR);
-
-    injectAPIHandlerInfos(apiDir, prefix);
-
-    return next(props);
-  },
-}));

package/tests/lambdaMode.test.ts

@@ -1,301 +0,0 @@
-import * as path from 'path';
-import request from 'supertest';
-import Koa from 'koa';
-import { serverManager } from '@modern-js/server-core';
-import Router from 'koa-router';
-import koaBody from 'koa-body';
-import plugin from '../src/plugin';
-import { APIPlugin } from './helpers';
-import { INTROSPECTION_ROUTE_PATH } from './common';
-
-const pwd = path.join(__dirname, './fixtures/lambda-mode');
-const API_DIR = './api';
-const MockKoa = Koa;
-const MockRouter = Router;
-const MockKoaBody = koaBody;
-
-describe('lambda-mode', () => {
-  const id = '666';
-  const name = 'foo';
-  const foo = { id, name };
-  let apiHandler: any;
-
-  beforeAll(async () => {
-    const runner = await serverManager
-      .clone()
-      .usePlugin(APIPlugin, plugin)
-      .init();
-    apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-      prefix: '/api',
-    });
-  });
-
-  test('should works', async () => {
-    const res = await request(apiHandler).get('/api/hello');
-    expect(res.status).toBe(200);
-  });
-
-  test('should works with query', async () => {
-    const res = await request(apiHandler).get(`/api/nest/user?id=${id}`);
-    expect(res.status).toBe(200);
-    expect(res.body.query.id).toBe(id);
-  });
-
-  test('should works with body', async () => {
-    const res = await request(apiHandler).post('/api/nest/user').send(foo);
-    expect(res.status).toBe(200);
-    expect(res.body.data).toEqual(foo);
-  });
-
-  test('should works with dynamic route ', async () => {
-    const res = await request(apiHandler).post(`/api/nest/${id}`);
-    expect(res.status).toBe(200);
-    expect(res.body).toEqual({ id });
-  });
-
-  test('should works with context', async () => {
-    const res = await request(apiHandler)
-      .post(`/api/nest/user?id=${id}`)
-      .send(foo);
-    expect(res.status).toBe(200);
-    expect(res.body.data).toEqual(foo);
-    expect(res.body.query.id).toBe(id);
-  });
-
-  test('should support cookies', async () => {
-    const res = await request(apiHandler)
-      .post(`/api/nest/user?id=${id}`)
-      .set('Cookie', [`id=${id};name=${name}`]);
-    expect(res.status).toBe(200);
-    expect(res.body.cookies.id).toBe(id);
-    expect(res.body.cookies.name).toBe(name);
-  });
-
-  test('should works with schema', async () => {
-    const res = await request(apiHandler).patch('/api/nest/user').send({
-      id: 777,
-      name: 'xxx',
-    });
-    expect(res.status).toBe(200);
-
-    const res2 = await request(apiHandler).patch('/api/nest/user').send({
-      id: 'aaa',
-      name: 'xxx',
-    });
-    expect(res2.status).toBe(400);
-
-    const res3 = await request(apiHandler).patch('/api/nest/user').send({
-      id: '777',
-      name: 'xxx',
-    });
-    expect(res3.status).toBe(500);
-  });
-
-  test('introspection', async () => {
-    const res = await request(apiHandler).get(
-      `/api${INTROSPECTION_ROUTE_PATH}`,
-    );
-    expect(res.status).toBe(200);
-    expect(res.body.protocol).toBe('Farrow-API');
-  });
-});
-
-describe('add middlewares', () => {
-  let runner: any;
-
-  beforeAll(async () => {
-    runner = await serverManager.clone().usePlugin(APIPlugin, plugin).init();
-  });
-
-  test('should works', async () => {
-    const foo = 'foo';
-    const fakeMiddleware = jest.fn(async (ctx: any, next: any) => {
-      await next();
-      ctx.body = foo;
-    });
-    const fakeMiddleware2 = jest.fn(async (ctx: any, next: any) => {
-      await next();
-    });
-
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const [mock_fakeMiddleware, mock_fakeMiddleware2] = [
-      fakeMiddleware,
-      fakeMiddleware2,
-    ];
-    const apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-      config: {
-        middleware: [
-          mock_fakeMiddleware,
-          mock_fakeMiddleware2,
-          mock_fakeMiddleware2,
-        ],
-      },
-    });
-
-    const res = await request(apiHandler).get('/user');
-    expect(fakeMiddleware.mock.calls.length).toBe(1);
-    expect(fakeMiddleware2.mock.calls.length).toBe(2);
-    expect(res.status).toBe(200);
-    expect(res.text).toEqual(foo);
-  });
-});
-
-describe('support use koaBody in app.ts', () => {
-  const id = '666';
-  const name = 'modernjs';
-  const foo = { id, name };
-
-  let runner: any;
-
-  beforeAll(async () => {
-    runner = await serverManager.clone().usePlugin(APIPlugin, plugin).init();
-  });
-
-  test('support use koaBody', async () => {
-    const mock_foo = foo;
-    jest.mock(
-      path.join(pwd, API_DIR, 'app.ts'),
-      () => {
-        const app = new MockKoa();
-        // test app takes effect
-        app.use(async (ctx, next) => {
-          ctx.request.query = mock_foo;
-          await next();
-        });
-
-        app.use(MockKoaBody());
-
-        return {
-          __esModule: true,
-          default: app,
-        };
-      },
-      { virtual: true },
-    );
-
-    const apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-    });
-    const res = await request(apiHandler).post('/nest/user').send(foo);
-    expect(res.status).toBe(200);
-    expect(res.body.query).toEqual(foo);
-    expect(res.body.data).toEqual(foo);
-  });
-});
-
-describe('support app.ts in lambda mode', () => {
-  const name = 'modernjs';
-
-  let runner: any;
-
-  beforeAll(async () => {
-    runner = await serverManager.clone().usePlugin(APIPlugin, plugin).init();
-  });
-
-  beforeEach(() => {
-    jest.resetModules();
-  });
-
-  test('support es module', async () => {
-    jest.mock(
-      path.join(pwd, API_DIR, 'app.ts'),
-      () => {
-        const app = new MockKoa();
-        return {
-          __esModule: true,
-          default: app,
-        };
-      },
-      { virtual: true },
-    );
-
-    const apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-    });
-
-    const res = await request(apiHandler).get(`/nest/user?name=${name}`);
-    expect(res.status).toBe(200);
-    expect(res.body.query.name).toBe(name);
-  });
-
-  test('support commonjs module', async () => {
-    jest.mock(
-      path.join(pwd, API_DIR, 'app.ts'),
-      () => {
-        const app = new MockKoa();
-        return app;
-      },
-      { virtual: true },
-    );
-
-    const apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-    });
-
-    const res = await request(apiHandler).get(`/nest/user?name=${name}`);
-    expect(res.status).toBe(200);
-    expect(res.body.query.name).toBe(name);
-  });
-
-  test('support use middleware', async () => {
-    const mock_name = name;
-    jest.mock(
-      path.join(pwd, API_DIR, 'app.ts'),
-      () => {
-        const app = new MockKoa();
-        app.use(async (ctx, next) => {
-          ctx.query.name = mock_name;
-          await next();
-        });
-        return app;
-      },
-      { virtual: true },
-    );
-
-    const apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-    });
-
-    const res = await request(apiHandler).get(`/nest/user`);
-    expect(res.status).toBe(200);
-    expect(res.body.query.name).toBe(name);
-  });
-
-  test('support use router', async () => {
-    jest.mock(
-      path.join(pwd, API_DIR, 'app.ts'),
-      () => {
-        const app = new MockKoa();
-        const router = new MockRouter();
-        router.get('/hello', ctx => {
-          ctx.body = `foo`;
-        });
-
-        app.use(router.routes());
-        return app;
-      },
-      { virtual: true },
-    );
-
-    const apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'framework',
-    });
-
-    const res1 = await request(apiHandler).get(`/hello`);
-    expect(res1.status).toBe(200);
-    expect(res1.text).toBe('foo');
-
-    const res2 = await request(apiHandler).get(`/nest/user?name=${name}`);
-    expect(res2.status).toBe(200);
-    expect(res2.body.query.name).toBe(name);
-  });
-});

package/tests/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "sourceMap": true
-  },
-  "paths": {},
-  "exclude": ["src/__test__/fixtures/**"]
-}

package/tests/webServer.test.ts

@@ -1,81 +0,0 @@
-import * as path from 'path';
-import fs from 'fs';
-import request from 'supertest';
-import { serverManager } from '@modern-js/server-core';
-import plugin from '../src/plugin';
-import { APIPlugin } from './helpers';
-import './common';
-
-const pwd = path.join(__dirname, './fixtures/function-mode');
-
-describe('webServer', () => {
-  const id = '666';
-  const name = 'foo';
-  const foo = { id, name };
-  let webHandler: any;
-  let runner: any;
-
-  beforeAll(async () => {
-    runner = await serverManager.clone().usePlugin(APIPlugin, plugin).init();
-  });
-
-  test('support json', async () => {
-    const middleware = (ctx: any) => {
-      // ctx.req.url = `${ctx.req.url}?id=${id}`;
-      ctx.body = foo;
-    };
-
-    webHandler = await runner.prepareWebServer({
-      pwd,
-      config: { middleware: [middleware] },
-    });
-
-    const res = await request(webHandler).get('/');
-    expect(res.status).toBe(200);
-    expect(res.get('content-type')).toBe('application/json; charset=utf-8');
-    expect(res.body).toEqual(foo);
-  });
-
-  test('support stream', async () => {
-    const middleware = (ctx: any) => {
-      ctx.response.set('content-type', 'text/html');
-      ctx.body = fs.createReadStream(
-        path.resolve(__dirname, './fixtures/assets/index.html'),
-      );
-    };
-
-    webHandler = await runner.prepareWebServer({
-      pwd,
-      config: { middleware: [middleware] },
-    });
-
-    const res = await request(webHandler).get('/');
-    expect(res.status).toBe(200);
-    expect(res.get('content-type')).toBe('text/html');
-    expect(res.text).toContain(`hello koa plugin`);
-  });
-
-  test('should support Multiple middleware', async () => {
-    const middleware1 = async (ctx: any, next: any) => {
-      await next();
-    };
-
-    const middleware2 = async (ctx: any, next: any) => {
-      ctx.response.set('content-type', 'text/html');
-      ctx.body = fs.createReadStream(
-        path.resolve(__dirname, './fixtures/assets/index.html'),
-      );
-      await next();
-    };
-
-    webHandler = await runner.prepareWebServer({
-      pwd,
-      config: { middleware: [middleware1, middleware2] },
-    });
-
-    const res = await request(webHandler).get('/');
-    expect(res.status).toBe(200);
-    expect(res.get('content-type')).toBe('text/html');
-    expect(res.text).toContain(`hello koa plugin`);
-  });
-});