@modern-js/plugin-express 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,54 @@
 # @modern-js/plugin-express
 
+## 1.4.1
+
+### Patch Changes
+
+- 3eee457b: fix: move some peerDependencies to dependecies
+- Updated dependencies [cc5e8001]
+- Updated dependencies [2520ea86]
+- Updated dependencies [db43dce6]
+- Updated dependencies [e81fd9b7]
+- Updated dependencies [1c411e71]
+  - @modern-js/core@1.4.6
+  - @modern-js/utils@1.3.4
+
+## 1.4.0
+
+### Minor Changes
+
+- ec4dbffb: feat: support as a pure api service
+
+### Patch Changes
+
+- 272cab15: refactor server plugin manager
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [272cab15]
+  - @modern-js/core@1.4.0
+  - @modern-js/utils@1.3.0
+  - @modern-js/server-core@1.2.2
+
+## 1.3.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/adapter-helpers@1.2.1
+  - @modern-js/bff-runtime@1.2.1
+  - @modern-js/bff-utils@1.2.2
+  - @modern-js/server-plugin@1.2.1
+  - @modern-js/utils@1.2.2
+
 ## 1.3.0
 
 ### Minor Changes

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

@@ -29,7 +29,7 @@ export default createPlugin(() => {
       };
     },
 
-    modifyEntryImports(input) {
+    addRuntimeExports(input) {
       // eslint-disable-next-line react-hooks/rules-of-hooks
       const {
         appDirectory

package/dist/js/modern/plugin.js

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import express from 'express';
 import cookieParser from 'cookie-parser';
-import { createPlugin } from '@modern-js/server-plugin';
+import { createPlugin } from '@modern-js/server-core';
 import { requireModule } from '@modern-js/bff-utils';
 import { fs, createDebugger } from '@modern-js/utils';
 import finalhandler from 'finalhandler';

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

@@ -43,7 +43,7 @@ var _default = (0, _core.createPlugin)(() => {
       };
     },
 
-    modifyEntryImports(input) {
+    addRuntimeExports(input) {
       // eslint-disable-next-line react-hooks/rules-of-hooks
       const {
         appDirectory

package/dist/js/node/plugin.js

@@ -11,7 +11,7 @@ var _express = _interopRequireDefault(require("express"));
 
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
 
-var _serverPlugin = require("@modern-js/server-plugin");
+var _serverCore = require("@modern-js/server-core");
 
 var _bffUtils = require("@modern-js/bff-utils");
 
@@ -70,7 +70,7 @@ const initApp = app => {
   return app;
 };
 
-var _default = (0, _serverPlugin.createPlugin)(() => ({
+var _default = (0, _serverCore.createPlugin)(() => ({
   // eslint-disable-next-line max-statements
   async prepareApiServer({
     pwd,

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

@@ -11,8 +11,10 @@ declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@m
   watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   fileChange: import("@modern-js/core").AsyncWorkflow<{
     filename: string;
+    eventType: "add" | "unlink" | "change";
   }, void>;
   beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
+  beforeRestart: import("@modern-js/core").AsyncWorkflow<void, void>;
 } & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
 
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.0",
+  "version": "1.4.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,17 +34,20 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.3",
-    "@modern-js/adapter-helpers": "^1.2.0",
-    "@modern-js/utils": "^1.2.0",
+    "@modern-js/adapter-helpers": "^1.2.1",
+    "@modern-js/utils": "^1.3.4",
     "cookie-parser": "^1.4.5",
     "finalhandler": "^1.1.2",
     "formidable": "^1.2.2",
-    "type-is": "^1.6.18"
+    "type-is": "^1.6.18",
+    "@modern-js/core": "^1.4.6",
+    "@modern-js/bff-utils": "^1.2.2",
+    "@modern-js/server-core": "^1.2.2",
+    "@modern-js/bff-runtime": "^1.2.1"
   },
   "devDependencies": {
     "express": "^4.17.1",
-    "@modern-js/server-utils": "^1.2.0",
-    "@modern-js/bff-runtime": "^1.2.0",
+    "@modern-js/server-utils": "^1.2.1",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.13",
     "@types/finalhandler": "^1.1.1",
@@ -55,9 +58,7 @@
     "@types/type-is": "^1.6.3",
     "supertest": "^6.1.6",
     "typescript": "^4",
-    "@modern-js/bff-utils": "^1.2.0",
-    "@modern-js/core": "^1.3.0",
-    "@modern-js/server-plugin": "^1.2.0",
+    "@modern-js/core": "^1.4.6",
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"
@@ -68,16 +69,11 @@
     }
   },
   "peerDependencies": {
-    "@modern-js/bff-utils": "^1.2.0",
-    "@modern-js/core": "^1.3.0",
-    "@modern-js/server-plugin": "^1.2.0",
-    "@modern-js/bff-runtime": "^1.2.0",
     "express": "^4.17.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/functionMode.test.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import request from 'supertest';
-import { serverManager } from '@modern-js/server-plugin';
+import { serverManager } from '@modern-js/server-core';
 import { INTROSPECTION_ROUTE_PATH } from '@modern-js/bff-utils';
 import plugin from '../src/plugin';
 import { APIPlugin } from './helpers';

package/tests/helpers.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { createPlugin } from '@modern-js/server-plugin';
+import { createPlugin } from '@modern-js/server-core';
 import { injectAPIHandlerInfos, API_DIR } from '@modern-js/bff-utils';
 
 export const APIPlugin = createPlugin(() => ({

package/tests/lambdaMode.test.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 import express from 'express';
 import request from 'supertest';
-import { serverManager } from '@modern-js/server-plugin';
+import { serverManager } from '@modern-js/server-core';
 import { INTROSPECTION_ROUTE_PATH } from '@modern-js/bff-utils';
 import plugin from '../src/plugin';
 import { APIPlugin } from './helpers';

package/tests/webServer.test.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 import { Buffer } from 'buffer';
 import { Request, Response } from 'express';
 import request from 'supertest';
-import { serverManager } from '@modern-js/server-plugin';
+import { serverManager } from '@modern-js/server-core';
 import plugin from '../src/plugin';
 import './common';
 

package/src/cli/index.ts

@@ -1,85 +0,0 @@
-import * as path from 'path';
-import { useAppContext, createPlugin } from '@modern-js/core';
-import { createRuntimeExportsUtils } from '@modern-js/utils';
-
-export default createPlugin(
-  () => {
-    let bffExportsUtils: any;
-    const runtimeModulePath = path.resolve(__dirname, '../runtime');
-
-    return {
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const appContext = useAppContext();
-        const { 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,
-          )}`;
-        }
-
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/server': relativeRuntimePath,
-            },
-          },
-        };
-      },
-      modifyEntryImports(input) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const { appDirectory } = useAppContext();
-        const runtimePath = require.resolve(`@modern-js/runtime`, {
-          paths: [appDirectory],
-        });
-
-        const currentFile = bffExportsUtils.getPath();
-
-        const runtimeDir = path.dirname(runtimePath);
-
-        const relativeBffPath = path.relative(
-          path.dirname(currentFile),
-          path.join(runtimeDir, './exports/server'),
-        );
-        const relativeRuntimeModulePath = path.relative(
-          path.dirname(currentFile),
-          runtimeModulePath,
-        );
-
-        const relativeFramePath = path.relative(
-          path.dirname(currentFile),
-          require.resolve('express'),
-        );
-
-        bffExportsUtils.addExport(`const bffRuntime = require('${relativeBffPath}');
-           const pluginRuntime = require('${relativeRuntimeModulePath}');
-           const express = require('${relativeFramePath}')
-           module.exports = {
-            express: express,
-             ...bffRuntime,
-             ...pluginRuntime
-           }
-          `);
-        return input;
-      },
-    };
-  },
-  { name: '@modern-js/plugin-express' },
-);

package/src/context.ts

@@ -1,8 +0,0 @@
-import { createStorage } from '@modern-js/adapter-helpers';
-import { Request, Response } from 'express';
-
-export type Context = { req: Request; res: Response };
-
-const { run, useContext } = createStorage<Context>();
-
-export { run, useContext };

package/src/index.ts

@@ -1,5 +0,0 @@
-// eslint-disable-next-line filenames/match-exported
-import plugin from './plugin';
-
-export * from './context';
-export default plugin;

package/src/plugin.ts

@@ -1,157 +0,0 @@
-import * as path from 'path';
-import express, { RequestHandler, Express } from 'express';
-import type { Request, Response } from 'express';
-import cookieParser from 'cookie-parser';
-import { createPlugin } from '@modern-js/server-plugin';
-import { requireModule } from '@modern-js/bff-utils';
-import { fs, createDebugger } from '@modern-js/utils';
-import finalhandler from 'finalhandler';
-import { run } from './context';
-import registerRoutes from './registerRoutes';
-
-const debug = createDebugger('express');
-
-interface FrameConfig {
-  middleware: (RequestHandler | string)[];
-}
-
-export type Mode = 'function' | 'framework';
-
-const findAppModule = async (apiDir: string) => {
-  const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
-
-  for (const filename of paths) {
-    if (await fs.pathExists(filename)) {
-      return requireModule(filename);
-    }
-  }
-
-  return null;
-};
-
-const initMiddlewares = (
-  middleware: (RequestHandler | string)[],
-  app: Express,
-) => {
-  middleware.forEach(middlewareItem => {
-    const middlewareFunc =
-      typeof middlewareItem === 'string'
-        ? requireModule(middlewareItem)
-        : middlewareItem;
-    app.use(middlewareFunc);
-  });
-};
-
-const useRun = (app: Express) => {
-  app.use((req, res, next) => {
-    run({ req, res }, next);
-  });
-};
-
-const initApp = (app: express.Express) => {
-  app.use(cookieParser());
-  app.use(express.text());
-  app.use(express.urlencoded({ extended: true }));
-  app.use(express.json());
-  return app;
-};
-
-export default createPlugin(
-  () => ({
-    // eslint-disable-next-line max-statements
-    async prepareApiServer({ pwd, mode, config }) {
-      let app: Express;
-      const apiDir = path.join(pwd, './api');
-      if (mode === 'framework') {
-        app = await findAppModule(apiDir);
-
-        if (!app || !app.use) {
-          // console.warn('There is not api/app.ts.');
-          app = express();
-        }
-        initApp(app);
-
-        if (config) {
-          const { middleware } = config as FrameConfig;
-          initMiddlewares(middleware, app);
-        }
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        useRun(app);
-
-        registerRoutes(app);
-      } else if (mode === 'function') {
-        app = express();
-        initApp(app);
-
-        if (config) {
-          const { middleware } = config as FrameConfig;
-          initMiddlewares(middleware, app);
-        }
-
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        useRun(app);
-
-        registerRoutes(app);
-      } else {
-        throw new Error(`mode must be function or framework`);
-      }
-
-      return (req, res) =>
-        new Promise((resolve, reject) => {
-          const handler = (err: any) => {
-            if (err) {
-              return reject(err);
-            }
-            // finalhanlder will trigger 'finish' event
-            return finalhandler(req, res, {})(null);
-            // return resolve();
-          };
-
-          res.on('finish', (err: Error) => {
-            if (err) {
-              return reject(err);
-            }
-            return resolve();
-          });
-          return app(req as Request, res as Response, handler);
-        });
-    },
-
-    prepareWebServer({ config }) {
-      const app = express();
-      initApp(app);
-      if (config) {
-        const { middleware } = config as FrameConfig;
-        debug('web middleware', middleware);
-        initMiddlewares(middleware, app);
-      }
-
-      return (req, res) =>
-        new Promise((resolve, reject) => {
-          const handler = (err: string) => {
-            if (err) {
-              return reject(err);
-            }
-            if (res.headersSent && res.statusCode !== 200) {
-              finalhandler(req, res, {})(null);
-            }
-            return resolve();
-          };
-
-          // when user call res.send
-          res.on('finish', (err: Error) => {
-            if (err) {
-              return reject(err);
-            }
-            return resolve();
-          });
-          return app(req as Request, res as Response, handler);
-        });
-    },
-  }),
-  {
-    name: '@modern-js/plugin-express',
-    pre: ['@modern-js/plugin-bff'],
-  },
-) as any;

package/src/registerRoutes.ts

@@ -1,119 +0,0 @@
-import { HttpMethod, useAPIHandlerInfos } from '@modern-js/bff-utils';
-import { isSchemaHandler, InputType } from '@modern-js/bff-runtime';
-import {
-  Express,
-  Request,
-  Response,
-  RequestHandler,
-  NextFunction,
-} from 'express';
-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('express');
-
-const registerRoutes = (app: Express) => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const handlerInfos = useAPIHandlerInfos();
-  sortDynamicRoutes(handlerInfos);
-  debug('handlerInfos', handlerInfos);
-
-  handlerInfos.forEach(({ path, handler, method, name }) => {
-    const wrapedHandler: RequestHandler = async (
-      req: Request,
-      res: Response,
-      next: NextFunction,
-    ) => {
-      const input = await getInputFromRequest(req);
-
-      if (isSchemaHandler(handler)) {
-        const result = await handler(input);
-        if (result.type !== 'HandleSuccess') {
-          if (result.type === 'InputValidationError') {
-            res.status(400);
-          } else {
-            res.status(500);
-          }
-          return res.json(result.message);
-        } else {
-          res.status(200);
-          return res.json(result.value);
-        }
-      } else {
-        const args = Object.values(input.params as any).concat(input);
-
-        try {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          const body = await handler(...args);
-
-          // this should never happen
-          if (res.headersSent) {
-            return await Promise.resolve();
-          }
-
-          res.status(200);
-          return res.json(body);
-        } catch (e) {
-          return next(e);
-        }
-      }
-    };
-
-    Object.defineProperties(
-      wrapedHandler,
-      Object.getOwnPropertyDescriptors(handler),
-    );
-
-    if (isNormalMethod(method)) {
-      const routeName = method.toLowerCase();
-      (app as any)[routeName](path || name, wrapedHandler);
-    } else {
-      throw new Error(`Unknown HTTP Method: ${method}`);
-    }
-  });
-};
-
-const isNormalMethod = (method: string): method is HttpMethod =>
-  Object.keys(HttpMethod).includes(method);
-
-export default registerRoutes;
-
-const getInputFromRequest = async (request: Request): Promise<InputType> => {
-  const draft: Record<string, any> = {
-    params: request.params,
-    query: request.query,
-    headers: request.headers,
-    cookies: request.headers.cookie,
-  };
-
-  if (typeIs(request, ['application/json'])) {
-    draft.data = request.body;
-  } else if (typeIs(request, ['multipart/form-data'])) {
-    draft.formData = await resvoleFormData(request);
-  } else if (typeIs(request, ['application/x-www-form-urlencoded'])) {
-    draft.formUrlencoded = request.body;
-  } else {
-    draft.body = request.body;
-  }
-
-  return draft as any;
-};
-
-const resvoleFormData = (request: Request): Promise<Record<string, any>> => {
-  const form = formidable({ multiples: true });
-  return new Promise((resolve, reject) => {
-    form.parse(request, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      resolve({
-        ...fields,
-        ...files,
-      });
-    });
-  });
-};

package/src/runtime.ts

@@ -1 +0,0 @@
-export { useContext } from './context';