@modern-js/plugin-express 2.5.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @modern-js/plugin-express
 
+## 2.7.0
+
+### Minor Changes
+
+- 84bfb439b8: feat: support custom apiDir, lambdaDir and style of writing for bff
+  feat: 支持定制 api 目录，lambda 目录，bff 的写法
+
+### Patch Changes
+
+- Updated dependencies [0f15fc597c]
+- Updated dependencies [dcad887024]
+- Updated dependencies [a4672f7c16]
+- Updated dependencies [7bb1554194]
+- Updated dependencies [7fff9020e1]
+- Updated dependencies [1eea234fdd]
+- Updated dependencies [84bfb439b8]
+  - @modern-js/utils@2.7.0
+  - @modern-js/types@2.7.0
+  - @modern-js/bff-core@2.7.0
+  - @modern-js/bff-runtime@2.7.0
+
+## 2.6.0
+
+### Patch Changes
+
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [49fa0b1]
+- Updated dependencies [0fe658a]
+- Updated dependencies [62930b9]
+  - @modern-js/utils@2.6.0
+  - @modern-js/types@2.6.0
+  - @modern-js/bff-core@2.6.0
+  - @modern-js/bff-runtime@2.6.0
+
 ## 2.5.0
 
 ### Patch Changes

package/dist/cjs/cli/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/plugin.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -85,9 +89,10 @@ var plugin_default = () => ({
   setup: (api) => ({
     async prepareApiServer({ pwd, config }) {
       let app;
-      const apiDir = path.join(pwd, "./api");
       const appContext = api.useAppContext();
       const apiHandlerInfos = appContext.apiHandlerInfos;
+      const apiDirectory = appContext.apiDirectory;
+      const apiDir = apiDirectory || path.join(pwd, "./api");
       const mode = appContext.apiMode;
       if (mode === "framework") {
         const appModule = await findAppModule(apiDir);

package/dist/cjs/runtime/operators.js

@@ -25,6 +25,7 @@ var import_context = require("../context");
 const Pipe = (func) => {
   return {
     name: "pipe",
+    // eslint-disable-next-line consistent-return
     async execute(executeHelper, next) {
       const { inputs } = executeHelper;
       const ctx = (0, import_context.useContext)();

package/dist/cjs/utils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -58,6 +62,7 @@ const handleResponseMeta = (res, handler) => {
 };
 const createRouteHandler = (handler) => {
   const apiHandler = async (req, res, next) => {
+    var _a;
     const input = await getInputFromRequest(req);
     if ((0, import_bff_core.isWithMetaHandler)(handler)) {
       try {
@@ -91,19 +96,32 @@ const createRouteHandler = (handler) => {
         res.status(200);
         return res.json(result1.value);
       }
-    } else {
-      const args = Object.values(input.params).concat(input);
+    } else if ((0, import_bff_core.isInputParamsDeciderHandler)(handler)) {
       try {
+        const args = ((_a = input == null ? void 0 : input.data) == null ? void 0 : _a.args) || [];
         const body = await handler(...args);
-        if (res.headersSent) {
-          return await Promise.resolve();
-        }
         if (typeof body !== "undefined") {
-          return res.json(body);
+          if (typeof body === "object") {
+            return res.json(body);
+          }
+          return res.send(body);
         }
       } catch (e) {
         return next(e);
       }
+    } else {
+      const args1 = Object.values(input.params).concat(input);
+      try {
+        const body1 = await handler(...args1);
+        if (res.headersSent) {
+          return await Promise.resolve();
+        }
+        if (typeof body1 !== "undefined") {
+          return res.json(body1);
+        }
+      } catch (e1) {
+        return next(e1);
+      }
     }
   };
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));

package/dist/esm/plugin.js

@@ -257,13 +257,14 @@ var plugin_default = function() {
                 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;
+                        var app, appContext, apiHandlerInfos, apiDirectory, apiDir, 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;
+                                    apiDirectory = appContext.apiDirectory;
+                                    apiDir = apiDirectory || path.join(pwd, "./api");
                                     mode = appContext.apiMode;
                                     if (!(mode === "framework")) return [
                                         3,

package/dist/esm/runtime/operators.js

@@ -126,7 +126,8 @@ import { useContext } from "../context";
 var Pipe = function(func) {
     return {
         name: "pipe",
-        execute: function execute(executeHelper, next) {
+        execute: // eslint-disable-next-line consistent-return
+        function execute(executeHelper, next) {
             return _asyncToGenerator(function() {
                 var inputs, ctx, res, isPiped, end, output;
                 return __generator(this, function(_state) {

package/dist/esm/utils.js

@@ -216,7 +216,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import "reflect-metadata";
-import { httpMethods, isWithMetaHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
+import { httpMethods, isWithMetaHandler, isInputParamsDeciderHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
 import typeIs from "type-is";
 import formidable from "formidable";
@@ -281,7 +281,7 @@ var handleResponseMeta = function(res, handler) {
 var createRouteHandler = function(handler) {
     var apiHandler = function() {
         var _ref = _asyncToGenerator(function(req, res, next) {
-            var input, result, error, result1, args, body, e;
+            var input, result, error, result1, _input_data, args, body, e, args1, body1, e1;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -340,7 +340,7 @@ var createRouteHandler = function(handler) {
                     case 5:
                         return [
                             3,
-                            14
+                            19
                         ];
                     case 6:
                         if (!isSchemaHandler(handler)) return [
@@ -372,55 +372,102 @@ var createRouteHandler = function(handler) {
                         }
                         return [
                             3,
-                            14
+                            19
                         ];
                     case 8:
-                        args = Object.values(input.params).concat(input);
+                        if (!isInputParamsDeciderHandler(handler)) return [
+                            3,
+                            13
+                        ];
                         _state.label = 9;
                     case 9:
                         _state.trys.push([
                             9,
-                            13,
+                            11,
                             ,
-                            14
+                            12
                         ]);
+                        args = (input === null || input === void 0 ? void 0 : (_input_data = input.data) === null || _input_data === void 0 ? void 0 : _input_data.args) || [];
                         return [
                             4,
                             handler.apply(void 0, _toConsumableArray(args))
                         ];
                     case 10:
                         body = _state.sent();
-                        if (!res.headersSent) return [
+                        if (typeof body !== "undefined") {
+                            if (typeof body === "object") {
+                                return [
+                                    2,
+                                    res.json(body)
+                                ];
+                            }
+                            return [
+                                2,
+                                res.send(body)
+                            ];
+                        }
+                        return [
                             3,
                             12
                         ];
+                    case 11:
+                        e = _state.sent();
+                        return [
+                            2,
+                            next(e)
+                        ];
+                    case 12:
+                        return [
+                            3,
+                            19
+                        ];
+                    case 13:
+                        args1 = Object.values(input.params).concat(input);
+                        _state.label = 14;
+                    case 14:
+                        _state.trys.push([
+                            14,
+                            18,
+                            ,
+                            19
+                        ]);
+                        return [
+                            4,
+                            handler.apply(void 0, _toConsumableArray(args1))
+                        ];
+                    case 15:
+                        body1 = _state.sent();
+                        if (!res.headersSent) return [
+                            3,
+                            17
+                        ];
                         return [
                             4,
                             Promise.resolve()
                         ];
-                    case 11:
+                    case 16:
                         return [
                             2,
                             _state.sent()
                         ];
-                    case 12:
-                        if (typeof body !== "undefined") {
+                    case 17:
+                        if (typeof body1 !== "undefined") {
                             return [
                                 2,
-                                res.json(body)
+                                res.json(body1)
                             ];
                         }
                         return [
                             3,
-                            14
+                            19
                         ];
-                    case 13:
-                        e = _state.sent();
+                    case 18:
+                        e1 = _state.sent();
                         return [
                             2,
-                            next(e)
+                            next(e1)
                         ];
-                    case 14:
+                    case 19:
                         return [
                             2
                         ];

package/dist/esm-node/plugin.js

@@ -57,9 +57,10 @@ var plugin_default = () => ({
   setup: (api) => ({
     async prepareApiServer({ pwd, config }) {
       let app;
-      const apiDir = path.join(pwd, "./api");
       const appContext = api.useAppContext();
       const apiHandlerInfos = appContext.apiHandlerInfos;
+      const apiDirectory = appContext.apiDirectory;
+      const apiDir = apiDirectory || path.join(pwd, "./api");
       const mode = appContext.apiMode;
       if (mode === "framework") {
         const appModule = await findAppModule(apiDir);

package/dist/esm-node/runtime/operators.js

@@ -2,6 +2,7 @@ import { useContext } from "../context";
 const Pipe = (func) => {
   return {
     name: "pipe",
+    // eslint-disable-next-line consistent-return
     async execute(executeHelper, next) {
       const { inputs } = executeHelper;
       const ctx = useContext();

package/dist/esm-node/utils.js

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { httpMethods, isWithMetaHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
+import { httpMethods, isWithMetaHandler, isInputParamsDeciderHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
 import typeIs from "type-is";
 import formidable from "formidable";
@@ -29,6 +29,7 @@ const handleResponseMeta = (res, handler) => {
 };
 const createRouteHandler = (handler) => {
   const apiHandler = async (req, res, next) => {
+    var _a;
     const input = await getInputFromRequest(req);
     if (isWithMetaHandler(handler)) {
       try {
@@ -62,19 +63,32 @@ const createRouteHandler = (handler) => {
         res.status(200);
         return res.json(result1.value);
       }
-    } else {
-      const args = Object.values(input.params).concat(input);
+    } else if (isInputParamsDeciderHandler(handler)) {
       try {
+        const args = ((_a = input == null ? void 0 : input.data) == null ? void 0 : _a.args) || [];
         const body = await handler(...args);
-        if (res.headersSent) {
-          return await Promise.resolve();
-        }
         if (typeof body !== "undefined") {
-          return res.json(body);
+          if (typeof body === "object") {
+            return res.json(body);
+          }
+          return res.send(body);
         }
       } catch (e) {
         return next(e);
       }
+    } else {
+      const args1 = Object.values(input.params).concat(input);
+      try {
+        const body1 = await handler(...args1);
+        if (res.headersSent) {
+          return await Promise.resolve();
+        }
+        if (typeof body1 !== "undefined") {
+          return res.json(body1);
+        }
+      } catch (e1) {
+        return next(e1);
+      }
     }
   };
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -42,10 +42,10 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.5.0",
-    "@modern-js/bff-runtime": "2.5.0",
-    "@modern-js/types": "2.5.0",
-    "@modern-js/utils": "2.5.0"
+    "@modern-js/bff-runtime": "2.7.0",
+    "@modern-js/types": "2.7.0",
+    "@modern-js/bff-core": "2.7.0",
+    "@modern-js/utils": "2.7.0"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -61,11 +61,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.5.0",
-    "@modern-js/app-tools": "2.5.0",
-    "@modern-js/server-core": "2.5.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0"
+    "@modern-js/core": "2.7.0",
+    "@modern-js/app-tools": "2.7.0",
+    "@modern-js/server-core": "2.7.0",
+    "@scripts/jest-config": "2.7.0",
+    "@scripts/build": "2.7.0"
   },
   "peerDependencies": {
     "express": "^4.17.1"
@@ -76,6 +76,7 @@
   },
   "scripts": {
     "new": "modern-lib new",
+    "dev": "modern-lib build --watch",
     "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }