@modern-js/plugin-express 1.2.0 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @modern-js/plugin-express
 
+## 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
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 146dcd85: modify server framework plugin hook types and hook context
+- 146dcd85: modify server framework plugin hook types
+- 146dcd85: fix test case in babel compiler
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [146dcd85]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [146dcd85]
+- Updated dependencies [8e7603ee]
+- Updated dependencies [146dcd85]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/bff-runtime@1.2.0
+  - @modern-js/adapter-helpers@1.2.0
+  - @modern-js/bff-utils@1.2.0
+  - @modern-js/server-plugin@1.2.0
+
+## 1.2.1
+
+### Patch Changes
+
+- ad107726: feat: new action support apppend type define
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/js/modern/plugin.js

@@ -62,7 +62,7 @@ export default createPlugin(() => ({
       app = await findAppModule(apiDir);
 
       if (!app || !app.use) {
-        console.warn('There is not api/app.ts.');
+        // console.warn('There is not api/app.ts.');
         app = express();
       }
 

package/dist/js/node/plugin.js

@@ -84,7 +84,7 @@ var _default = (0, _serverPlugin.createPlugin)(() => ({
       app = await findAppModule(apiDir);
 
       if (!app || !app.use) {
-        console.warn('There is not api/app.ts.');
+        // console.warn('There is not api/app.ts.');
         app = (0, _express.default)();
       }
 

package/jest.config.js

@@ -0,0 +1,8 @@
+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/modern.config.js

@@ -1,10 +1,2 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {
-  testing: {
-    jest: {
-      collectCoverage: true,
-      collectCoverageFrom: ['src/**/*.ts'],
-      coveragePathIgnorePatterns: ['/node_modules/'],
-    },
-  },
-};
+module.exports = {};

package/package.json

@@ -11,26 +11,31 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.3.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
   "exports": {
+    "./types": "./types.d.ts",
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
     },
-    "./cli": "./dist/js/node/cli/index.js"
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    }
   },
   "dependencies": {
     "@babel/runtime": "^7.15.3",
-    "@modern-js/adapter-helpers": "^1.1.1",
-    "@modern-js/utils": "^1.1.5",
+    "@modern-js/adapter-helpers": "^1.2.1",
+    "@modern-js/utils": "^1.2.2",
     "cookie-parser": "^1.4.5",
     "finalhandler": "^1.1.2",
     "formidable": "^1.2.2",
@@ -38,8 +43,8 @@
   },
   "devDependencies": {
     "express": "^4.17.1",
-    "@modern-js/server-utils": "^1.1.2",
-    "@modern-js/bff-runtime": "^1.1.1",
+    "@modern-js/server-utils": "^1.2.1",
+    "@modern-js/bff-runtime": "^1.2.1",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.13",
     "@types/finalhandler": "^1.1.1",
@@ -50,11 +55,12 @@
     "@types/type-is": "^1.6.3",
     "supertest": "^6.1.6",
     "typescript": "^4",
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/core": "^1.2.0",
-    "@modern-js/server-plugin": "^1.1.3",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.2"
+    "@modern-js/bff-utils": "^1.2.2",
+    "@modern-js/core": "^1.3.2",
+    "@modern-js/server-plugin": "^1.2.1",
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "modernConfig": {
     "output": {
@@ -62,20 +68,21 @@
     }
   },
   "peerDependencies": {
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/core": "^1.2.0",
-    "@modern-js/server-plugin": "^1.1.3",
-    "@modern-js/bff-runtime": "^1.1.1",
+    "@modern-js/bff-utils": "^1.2.2",
+    "@modern-js/core": "^1.3.2",
+    "@modern-js/server-plugin": "^1.2.1",
+    "@modern-js/bff-runtime": "^1.2.1",
     "express": "^4.17.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

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

@@ -1,7 +1,7 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 /* eslint-disable react-hooks/rules-of-hooks */
 import { match } from '@modern-js/bff-runtime';
-import { useContext } from '@/context';
+import { useContext } from '../../../../../src/context';
 
 // eslint-disable-next-line arrow-body-style
 export const get = ({ query }: { query: Record<string, unknown> }) => {

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

@@ -1,7 +1,7 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 /* eslint-disable react-hooks/rules-of-hooks */
 import { match } from '@modern-js/bff-runtime';
-import { useContext } from '@/context';
+import { useContext } from '../../../../../../src/context';
 
 export const get = ({ query }: { query: Record<string, unknown> }) => ({
   query,

package/tests/lambdaMode.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import express, { Request, Response } from 'express';
+import express from 'express';
 import request from 'supertest';
 import { serverManager } from '@modern-js/server-plugin';
 import { INTROSPECTION_ROUTE_PATH } from '@modern-js/bff-utils';
@@ -333,7 +333,7 @@ describe('support as async handler', () => {
       config: { middleware: [wrapMiddleware] },
     });
 
-    const asyncHandler = async (req: Request, res: Response) => {
+    const asyncHandler = async (req: any, res: any) => {
       await apiHandler(req, res);
       order.push(3);
     };

package/tests/tsconfig.json

@@ -7,8 +7,6 @@
     "isolatedModules": true,
     "sourceMap": true
   },
-  "paths": {
-    "@/*": ["../src/*"]
-  },
+  "paths": {},
   "exclude": ["src/__test__/fixtures/**"]
 }

package/tests/webServer.test.ts

@@ -3,7 +3,7 @@ import { Buffer } from 'buffer';
 import { Request, Response } from 'express';
 import request from 'supertest';
 import { serverManager } from '@modern-js/server-plugin';
-import plugin from '@/plugin';
+import plugin from '../src/plugin';
 import './common';
 
 const pwd = path.join(__dirname, './fixtures/function-mode');

package/types.d.ts

@@ -1,8 +1,19 @@
 /// <reference path="./dist/types/index.d.ts" />
 
 declare module '@modern-js/runtime/server' {
-  import { Request, Response } from 'express';
+  import { Request, Response, RequestHandler } from 'express';
+
+  type ExpressOptions = {
+    addMiddleware: (...input: RequestHandler[]) => void;
+  };
+
+  type ExpressAttacher = (options: ExpressOptions) => void;
 
   type Context = { req: Request; res: Response };
+
   export function useContext(): Context;
+
+  export function hook(attacher: ExpressAttacher): ExpressAttacher;
+
+  export * from '@modern-js/bff-runtime';
 }

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';

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

@@ -1,5 +0,0 @@
-import { hook } from '@modern-js/server-utils';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware('@koa/api');
-});