@modern-js/plugin-express 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/treeshaking/utils.js

@@ -0,0 +1,514 @@
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+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);
+        });
+    };
+}
+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;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+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 "reflect-metadata";
+import { httpMethods, isWithMetaHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
+import { isSchemaHandler } from "@modern-js/bff-runtime";
+import typeIs from "type-is";
+import formidable from "formidable";
+var handleResponseMeta = function(res, handler) {
+    var responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
+    if (Array.isArray(responseMeta)) {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = responseMeta[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var meta = _step.value;
+                var metaType = meta.type;
+                var metaValue = meta.value;
+                switch(metaType){
+                    case ResponseMetaType.Headers:
+                        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                        try {
+                            for(var _iterator1 = Object.entries(metaValue)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                                var _value = _slicedToArray(_step1.value, 2), key = _value[0], value = _value[1];
+                                res.append(key, value);
+                            }
+                        } catch (err) {
+                            _didIteratorError1 = true;
+                            _iteratorError1 = err;
+                        } finally{
+                            try {
+                                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                    _iterator1.return();
+                                }
+                            } finally{
+                                if (_didIteratorError1) {
+                                    throw _iteratorError1;
+                                }
+                            }
+                        }
+                        break;
+                    case ResponseMetaType.Redirect:
+                        res.redirect(metaValue);
+                        break;
+                    case ResponseMetaType.StatusCode:
+                        res.status(metaValue);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+    }
+};
+var createRouteHandler = function(handler) {
+    var apiHandler = function() {
+        var _ref = _asyncToGenerator(function(req, res, next) {
+            var input, result, error, result1, args, body, e;
+            return __generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            getInputFromRequest(req)
+                        ];
+                    case 1:
+                        input = _state.sent();
+                        if (!isWithMetaHandler(handler)) return [
+                            3,
+                            6
+                        ];
+                        _state.label = 2;
+                    case 2:
+                        _state.trys.push([
+                            2,
+                            4,
+                            ,
+                            5
+                        ]);
+                        handleResponseMeta(res, handler);
+                        if (res.headersSent) {
+                            return [
+                                2
+                            ];
+                        }
+                        return [
+                            4,
+                            handler(input)
+                        ];
+                    case 3:
+                        result = _state.sent();
+                        if (result && typeof result === "object") {
+                            return [
+                                2,
+                                res.json(result)
+                            ];
+                        }
+                        return [
+                            3,
+                            5
+                        ];
+                    case 4:
+                        error = _state.sent();
+                        if (_instanceof(error, ValidationError)) {
+                            res.status(error.status);
+                            return [
+                                2,
+                                res.json({
+                                    message: error.message
+                                })
+                            ];
+                        }
+                        throw error;
+                    case 5:
+                        return [
+                            3,
+                            14
+                        ];
+                    case 6:
+                        if (!isSchemaHandler(handler)) return [
+                            3,
+                            8
+                        ];
+                        return [
+                            4,
+                            handler(input)
+                        ];
+                    case 7:
+                        result1 = _state.sent();
+                        if (result1.type !== "HandleSuccess") {
+                            if (result1.type === "InputValidationError") {
+                                res.status(400);
+                            } else {
+                                res.status(500);
+                            }
+                            return [
+                                2,
+                                res.json(result1.message)
+                            ];
+                        } else {
+                            res.status(200);
+                            return [
+                                2,
+                                res.json(result1.value)
+                            ];
+                        }
+                        return [
+                            3,
+                            14
+                        ];
+                    case 8:
+                        args = Object.values(input.params).concat(input);
+                        _state.label = 9;
+                    case 9:
+                        _state.trys.push([
+                            9,
+                            13,
+                            ,
+                            14
+                        ]);
+                        return [
+                            4,
+                            handler.apply(void 0, _toConsumableArray(args))
+                        ];
+                    case 10:
+                        body = _state.sent();
+                        if (!res.headersSent) return [
+                            3,
+                            12
+                        ];
+                        return [
+                            4,
+                            Promise.resolve()
+                        ];
+                    case 11:
+                        return [
+                            2,
+                            _state.sent()
+                        ];
+                    case 12:
+                        if (typeof body !== "undefined") {
+                            return [
+                                2,
+                                res.json(body)
+                            ];
+                        }
+                        return [
+                            3,
+                            14
+                        ];
+                    case 13:
+                        e = _state.sent();
+                        return [
+                            2,
+                            next(e)
+                        ];
+                    case 14:
+                        return [
+                            2
+                        ];
+                }
+            });
+        });
+        return function apiHandler(req, res, next) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+    Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
+    return apiHandler;
+};
+var isNormalMethod = function(httpMethod) {
+    return httpMethods.includes(httpMethod);
+};
+var getInputFromRequest = function() {
+    var _ref = _asyncToGenerator(function(request) {
+        var draft;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    draft = {
+                        params: request.params,
+                        query: request.query,
+                        headers: request.headers,
+                        cookies: request.headers.cookie
+                    };
+                    if (!typeIs(request, [
+                        "application/json"
+                    ])) return [
+                        3,
+                        1
+                    ];
+                    draft.data = request.body;
+                    return [
+                        3,
+                        4
+                    ];
+                case 1:
+                    if (!typeIs(request, [
+                        "multipart/form-data"
+                    ])) return [
+                        3,
+                        3
+                    ];
+                    return [
+                        4,
+                        resolveFormData(request)
+                    ];
+                case 2:
+                    draft.formData = _state.sent();
+                    return [
+                        3,
+                        4
+                    ];
+                case 3:
+                    if (typeIs(request, [
+                        "application/x-www-form-urlencoded"
+                    ])) {
+                        draft.formUrlencoded = request.body;
+                    } else {
+                        draft.body = request.body;
+                    }
+                    _state.label = 4;
+                case 4:
+                    return [
+                        2,
+                        draft
+                    ];
+            }
+        });
+    });
+    return function getInputFromRequest(request) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var resolveFormData = function(request) {
+    var form = formidable({
+        multiples: true
+    });
+    return new Promise(function(resolve, reject) {
+        form.parse(request, function(err, fields, files) {
+            if (err) {
+                reject(err);
+            }
+            resolve(_objectSpread({}, fields, files));
+        });
+    });
+};
+export { createRouteHandler, isNormalMethod };

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

@@ -1,3 +1,6 @@
 import type { CliPlugin } from '@modern-js/core';
-declare const _default: () => CliPlugin;
+import type { AppTools } from '@modern-js/app-tools';
+
+declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/plugin.d.ts

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

package/package.json

@@ -11,25 +11,29 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.6",
   "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",
+  "types": "./dist/types/cli/index.d.ts",
+  "main": "./dist/js/node/cli/index.js",
+  "module": "./dist/js/treeshaking/cli/index.js",
+  "jsnext:modern": "./dist/js/modern/cli/index.js",
   "exports": {
     "./types": "./types.d.ts",
     ".": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
+    "./server": {
       "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": {
-      "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
     }
   },
   "dependencies": {
@@ -39,10 +43,10 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.0.0-beta.3",
-    "@modern-js/bff-runtime": "2.0.0-beta.3",
-    "@modern-js/types": "2.0.0-beta.3",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/bff-core": "2.0.0-beta.6",
+    "@modern-js/bff-runtime": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -58,15 +62,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.0.0-beta.3",
-    "@modern-js/server-core": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3",
-    "@scripts/build": "2.0.0-beta.3"
-  },
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "peerDependencies": {
     "express": "^4.17.1"

package/types.d.ts

@@ -15,7 +15,9 @@ declare module '@modern-js/runtime/express' {
   export * from '@modern-js/bff-core';
 }
 
+
 // Todo: remove on next version
+// For use with BFF, it will be removed on next version, and use @modern-js/runtime/express instead?
 declare module '@modern-js/runtime/server' {
   import { Request, Response, RequestHandler } from 'express';