@modern-js/plugin-express 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/node/utils.js

@@ -1,35 +1,92 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createRouteHandler: () => createRouteHandler,
+  isNormalMethod: () => isNormalMethod
 });
-exports.isNormalMethod = exports.createRouteHandler = void 0;
-require("reflect-metadata");
-var _bffCore = require("@modern-js/bff-core");
-var _bffRuntime = require("@modern-js/bff-runtime");
-var _typeIs = _interopRequireDefault(require("type-is"));
-var _formidable = _interopRequireDefault(require("formidable"));
-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; }
+module.exports = __toCommonJS(stdin_exports);
+var import_reflect_metadata = require("reflect-metadata");
+var import_bff_core = require("@modern-js/bff-core");
+var import_bff_runtime = require("@modern-js/bff-runtime");
+var import_type_is = __toESM(require("type-is"));
+var import_formidable = __toESM(require("formidable"));
+var __defProp2 = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 const handleResponseMeta = (res, handler) => {
-  const responseMeta = Reflect.getMetadata(_bffCore.HttpMetadata.Response, handler);
+  const responseMeta = Reflect.getMetadata(
+    import_bff_core.HttpMetadata.Response,
+    handler
+  );
   if (Array.isArray(responseMeta)) {
     for (const meta of responseMeta) {
       const metaType = meta.type;
       const metaValue = meta.value;
       switch (metaType) {
-        case _bffCore.ResponseMetaType.Headers:
-          // eslint-disable-next-line @typescript-eslint/ban-types
+        case import_bff_core.ResponseMetaType.Headers:
           for (const [key, value] of Object.entries(metaValue)) {
             res.append(key, value);
           }
           break;
-        case _bffCore.ResponseMetaType.Redirect:
+        case import_bff_core.ResponseMetaType.Redirect:
           res.redirect(metaValue);
           break;
-        case _bffCore.ResponseMetaType.StatusCode:
+        case import_bff_core.ResponseMetaType.StatusCode:
           res.status(metaValue);
           break;
         default:
@@ -38,99 +95,89 @@ const handleResponseMeta = (res, handler) => {
     }
   }
 };
-const createRouteHandler = handler => {
-  const apiHandler = async (req, res, next) => {
-    const input = await getInputFromRequest(req);
-    if ((0, _bffCore.isWithMetaHandler)(handler)) {
+const createRouteHandler = (handler) => {
+  const apiHandler = (req, res, next) => __async(void 0, null, function* () {
+    const input = yield getInputFromRequest(req);
+    if ((0, import_bff_core.isWithMetaHandler)(handler)) {
       try {
         handleResponseMeta(res, handler);
         if (res.headersSent) {
           return;
         }
-        const result = await handler(input);
-        if (result && typeof result === 'object') {
-          // eslint-disable-next-line consistent-return
+        const result = yield handler(input);
+        if (result && typeof result === "object") {
           return res.json(result);
         }
       } catch (error) {
-        if (error instanceof _bffCore.ValidationError) {
+        if (error instanceof import_bff_core.ValidationError) {
           res.status(error.status);
-          // eslint-disable-next-line consistent-return
           return res.json({
             message: error.message
           });
         }
         throw error;
       }
-    } else if ((0, _bffRuntime.isSchemaHandler)(handler)) {
-      const result = await handler(input);
-      if (result.type !== 'HandleSuccess') {
-        if (result.type === 'InputValidationError') {
+    } else if ((0, import_bff_runtime.isSchemaHandler)(handler)) {
+      const result = yield handler(input);
+      if (result.type !== "HandleSuccess") {
+        if (result.type === "InputValidationError") {
           res.status(400);
         } else {
           res.status(500);
         }
-        // eslint-disable-next-line consistent-return
         return res.json(result.message);
       } else {
         res.status(200);
-        // eslint-disable-next-line consistent-return
         return res.json(result.value);
       }
     } else {
       const args = Object.values(input.params).concat(input);
       try {
-        const body = await handler(...args);
-
-        // this should never happen
+        const body = yield handler(...args);
         if (res.headersSent) {
-          // eslint-disable-next-line consistent-return
-          return await Promise.resolve();
+          return yield Promise.resolve();
         }
-        if (typeof body !== 'undefined') {
-          // eslint-disable-next-line consistent-return
+        if (typeof body !== "undefined") {
           return res.json(body);
         }
       } catch (e) {
-        // eslint-disable-next-line consistent-return
         return next(e);
       }
     }
-  };
-  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
+  });
+  Object.defineProperties(
+    apiHandler,
+    Object.getOwnPropertyDescriptors(handler)
+  );
   return apiHandler;
 };
-exports.createRouteHandler = createRouteHandler;
-const isNormalMethod = httpMethod => _bffCore.httpMethods.includes(httpMethod);
-exports.isNormalMethod = isNormalMethod;
-const getInputFromRequest = async request => {
+const isNormalMethod = (httpMethod) => import_bff_core.httpMethods.includes(httpMethod);
+const getInputFromRequest = (request) => __async(void 0, null, function* () {
   const draft = {
     params: request.params,
     query: request.query,
     headers: request.headers,
     cookies: request.headers.cookie
   };
-  if ((0, _typeIs.default)(request, ['application/json'])) {
+  if ((0, import_type_is.default)(request, ["application/json"])) {
     draft.data = request.body;
-  } else if ((0, _typeIs.default)(request, ['multipart/form-data'])) {
-    draft.formData = await resolveFormData(request);
-  } else if ((0, _typeIs.default)(request, ['application/x-www-form-urlencoded'])) {
+  } else if ((0, import_type_is.default)(request, ["multipart/form-data"])) {
+    draft.formData = yield resolveFormData(request);
+  } else if ((0, import_type_is.default)(request, ["application/x-www-form-urlencoded"])) {
     draft.formUrlencoded = request.body;
   } else {
     draft.body = request.body;
   }
   return draft;
-};
-const resolveFormData = request => {
-  const form = (0, _formidable.default)({
-    multiples: true
-  });
+});
+const resolveFormData = (request) => {
+  const form = (0, import_formidable.default)({ multiples: true });
   return new Promise((resolve, reject) => {
     form.parse(request, (err, fields, files) => {
       if (err) {
         reject(err);
       }
-      resolve(_objectSpread(_objectSpread({}, fields), files));
+      resolve(__spreadValues(__spreadValues({}, fields), files));
     });
   });
-};
+};

package/dist/js/treeshaking/cli/index.js

@@ -0,0 +1,49 @@
+import * as path from "path";
+import { createRuntimeExportsUtils } from "@modern-js/utils";
+import { getRelativeRuntimePath } from "@modern-js/bff-core";
+var cli_default = function() {
+    return {
+        name: "@modern-js/plugin-express",
+        setup: function(api) {
+            var bffExportsUtils;
+            var useAppContext = api.useAppContext;
+            var runtimeModulePath = path.resolve(__dirname, "../runtime");
+            return {
+                config: function config() {
+                    var appContext = useAppContext();
+                    var appDirectory = appContext.appDirectory;
+                    bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "server");
+                    var serverRuntimePath = bffExportsUtils.getPath();
+                    var relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
+                    if (process.env.NODE_ENV === "production") {
+                        return {
+                            source: {
+                                alias: {
+                                    "@modern-js/runtime/server": relativeRuntimePath,
+                                    "@modern-js/runtime/express": relativeRuntimePath
+                                }
+                            }
+                        };
+                    } else {
+                        return {
+                            source: {
+                                alias: {
+                                    "@modern-js/runtime/server": serverRuntimePath,
+                                    "@modern-js/runtime/express": serverRuntimePath
+                                }
+                            }
+                        };
+                    }
+                },
+                addRuntimeExports: function addRuntimeExports(input) {
+                    var currentFile = bffExportsUtils.getPath();
+                    var relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
+                    var relativeFramePath = path.relative(path.dirname(currentFile), require.resolve("express"));
+                    bffExportsUtils.addExport("const pluginRuntime = require('".concat(relativeRuntimeModulePath, "');\n           const express = require('").concat(relativeFramePath, "')\n           module.exports = {\n            express: express,\n             ...pluginRuntime\n           }\n          "));
+                    return input;
+                }
+            };
+        }
+    };
+};
+export { cli_default as default };

package/dist/js/treeshaking/context.js

@@ -0,0 +1,3 @@
+import { createStorage } from "@modern-js/bff-core";
+var ref = createStorage(), run = ref.run, useContext = ref.useContext;
+export { run, useContext };

package/dist/js/treeshaking/index.js

@@ -0,0 +1,4 @@
+import plugin from "./plugin";
+export * from "./context";
+var src_default = plugin;
+export { src_default as default };

package/dist/js/treeshaking/plugin.js

@@ -0,0 +1,379 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import * as path from "path";
+import express from "express";
+import cookieParser from "cookie-parser";
+import { fs, createDebugger, compatRequire } from "@modern-js/utils";
+import finalhandler from "finalhandler";
+import { run } from "./context";
+import registerRoutes from "./registerRoutes";
+var debug = createDebugger("express");
+var findAppModule = function() {
+    var _ref = _asyncToGenerator(function(apiDir) {
+        var exts, paths, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, filename, err;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    exts = [
+                        ".ts",
+                        ".js"
+                    ];
+                    paths = exts.map(function(ext) {
+                        return path.resolve(apiDir, "app".concat(ext));
+                    });
+                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    _state.label = 1;
+                case 1:
+                    _state.trys.push([
+                        1,
+                        6,
+                        7,
+                        8
+                    ]);
+                    _iterator = paths[Symbol.iterator]();
+                    _state.label = 2;
+                case 2:
+                    if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
+                        3,
+                        5
+                    ];
+                    filename = _step.value;
+                    return [
+                        4,
+                        fs.pathExists(filename)
+                    ];
+                case 3:
+                    if (_state.sent()) {
+                        delete require.cache[filename];
+                        return [
+                            2,
+                            [
+                                compatRequire(filename),
+                                require(filename)
+                            ]
+                        ];
+                    }
+                    _state.label = 4;
+                case 4:
+                    _iteratorNormalCompletion = true;
+                    return [
+                        3,
+                        2
+                    ];
+                case 5:
+                    return [
+                        3,
+                        8
+                    ];
+                case 6:
+                    err = _state.sent();
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                    return [
+                        3,
+                        8
+                    ];
+                case 7:
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                    return [
+                        7
+                    ];
+                case 8:
+                    return [
+                        2,
+                        []
+                    ];
+            }
+        });
+    });
+    return function findAppModule(apiDir) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var initMiddlewares = function(middleware, app) {
+    middleware.forEach(function(middlewareItem) {
+        var middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
+        app.use(middlewareFunc);
+    });
+};
+var useRun = function(app) {
+    app.use(function(req, res, next) {
+        run({
+            req: req,
+            res: res
+        }, next);
+    });
+};
+var initApp = function(app) {
+    app.use(cookieParser());
+    app.use(express.text());
+    app.use(express.urlencoded({
+        extended: true
+    }));
+    app.use(express.json());
+    return app;
+};
+var plugin_default = function() {
+    return {
+        name: "@modern-js/plugin-express",
+        pre: [
+            "@modern-js/plugin-bff"
+        ],
+        post: [
+            "@modern-js/plugin-server"
+        ],
+        setup: function(api) {
+            return {
+                prepareApiServer: function prepareApiServer(param) {
+                    var pwd = param.pwd, config = param.config;
+                    return _asyncToGenerator(function() {
+                        var app, apiDir, appContext, apiHandlerInfos, mode, appModule, hooks, middleware, afterLambdaRegisted, middleware1;
+                        return __generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    apiDir = path.join(pwd, "./api");
+                                    appContext = api.useAppContext();
+                                    apiHandlerInfos = appContext.apiHandlerInfos;
+                                    mode = appContext.apiMode;
+                                    if (!(mode === "framework")) return [
+                                        3,
+                                        2
+                                    ];
+                                    return [
+                                        4,
+                                        findAppModule(apiDir)
+                                    ];
+                                case 1:
+                                    appModule = _state.sent();
+                                    app = appModule[0];
+                                    hooks = appModule[1];
+                                    if (!app || !app.use) {
+                                        app = express();
+                                    }
+                                    initApp(app);
+                                    if (config) {
+                                        middleware = config.middleware;
+                                        initMiddlewares(middleware, app);
+                                    }
+                                    useRun(app);
+                                    registerRoutes(app, apiHandlerInfos);
+                                    if (hooks) {
+                                        afterLambdaRegisted = hooks.afterLambdaRegisted;
+                                        if (afterLambdaRegisted) {
+                                            afterLambdaRegisted(app);
+                                        }
+                                    }
+                                    return [
+                                        3,
+                                        3
+                                    ];
+                                case 2:
+                                    if (mode === "function") {
+                                        app = express();
+                                        initApp(app);
+                                        if (config) {
+                                            middleware1 = config.middleware;
+                                            initMiddlewares(middleware1, app);
+                                        }
+                                        useRun(app);
+                                        registerRoutes(app, apiHandlerInfos);
+                                    } else {
+                                        throw new Error("mode must be function or framework");
+                                    }
+                                    _state.label = 3;
+                                case 3:
+                                    return [
+                                        2,
+                                        function(req, res) {
+                                            return new Promise(function(resolve, reject) {
+                                                var handler = function(err) {
+                                                    if (err) {
+                                                        return reject(err);
+                                                    }
+                                                    return finalhandler(req, res, {})(null);
+                                                };
+                                                res.on("finish", function(err) {
+                                                    if (err) {
+                                                        return reject(err);
+                                                    }
+                                                    return resolve();
+                                                });
+                                                return app(req, res, handler);
+                                            });
+                                        }
+                                    ];
+                            }
+                        });
+                    })();
+                },
+                prepareWebServer: function prepareWebServer(param, next) {
+                    var config = param.config;
+                    var ref;
+                    var userConfig = api.useConfigContext();
+                    if (userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.server) === null || ref === void 0 ? void 0 : ref.disableFrameworkExt) {
+                        return next();
+                    }
+                    var app = express();
+                    initApp(app);
+                    if (config) {
+                        var middleware = config.middleware;
+                        debug("web middleware", middleware);
+                        initMiddlewares(middleware, app);
+                    }
+                    return function(ctx) {
+                        return new Promise(function(resolve, reject) {
+                            var _source = ctx.source, req = _source.req, res = _source.res;
+                            var handler = function(err) {
+                                if (err) {
+                                    return reject(err);
+                                }
+                                if (res.headersSent && res.statusCode !== 200) {
+                                    finalhandler(req, res, {})(null);
+                                }
+                                return resolve();
+                            };
+                            res.on("finish", function(err) {
+                                if (err) {
+                                    return reject(err);
+                                }
+                                return resolve();
+                            });
+                            return app(req, res, handler);
+                        });
+                    };
+                }
+            };
+        }
+    };
+};
+export { plugin_default as default };