@modern-js/plugin-express 2.57.1-alpha.0 → 2.58.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/cjs/plugin.js +7 -7
  2. package/dist/esm/plugin.js +43 -159
  3. package/dist/esm-node/plugin.js +8 -8
  4. package/package.json +10 -12
package/dist/cjs/plugin.js CHANGED
@@ -49,18 +49,18 @@ const findAppModule = async (apiDir) => {
49
49
  if (await import_utils.fs.pathExists(filename)) {
50
50
  delete require.cache[filename];
51
51
  return [
52
- await (0, import_utils.compatibleRequire)(filename),
52
+ (0, import_utils.compatRequire)(filename),
53
53
  require(filename)
54
54
  ];
55
55
  }
56
56
  }
57
57
  return [];
58
58
  };
59
- const initMiddlewares = async (middleware, app) => {
60
- for (const middlewareItem of middleware) {
61
- const middlewareFunc = typeof middlewareItem === "string" ? await (0, import_utils.compatibleRequire)(middlewareItem) : middlewareItem;
59
+ const initMiddlewares = (middleware, app) => {
60
+ middleware.forEach((middlewareItem) => {
61
+ const middlewareFunc = typeof middlewareItem === "string" ? (0, import_utils.compatRequire)(middlewareItem) : middlewareItem;
62
62
  app.use(middlewareFunc);
63
- }
63
+ });
64
64
  };
65
65
  const useRun = (app) => {
66
66
  app.use((req, res, next) => {
@@ -81,7 +81,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
81
81
  }
82
82
  initApp(app);
83
83
  if (middlewares && middlewares.length > 0) {
84
- await initMiddlewares(middlewares, app);
84
+ initMiddlewares(middlewares, app);
85
85
  }
86
86
  useRun(app);
87
87
  (0, import_registerRoutes.default)(app, apiHandlerInfos);
@@ -95,7 +95,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
95
95
  app = (0, import_express.default)();
96
96
  initApp(app);
97
97
  if (middlewares && middlewares.length > 0) {
98
- await initMiddlewares(middlewares, app);
98
+ initMiddlewares(middlewares, app);
99
99
  }
100
100
  useRun(app);
101
101
  (0, import_registerRoutes.default)(app, apiHandlerInfos);
package/dist/esm/plugin.js CHANGED
@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
3
3
  import * as path from "path";
4
4
  import express from "express";
5
5
  import cookieParser from "cookie-parser";
6
- import { compatibleRequire, fs, logger } from "@modern-js/utils";
6
+ import { fs, compatRequire, logger } from "@modern-js/utils";
7
7
  import finalhandler from "finalhandler";
8
8
  import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
9
9
  import { run } from "./context";
@@ -26,9 +26,9 @@ var findAppModule = function() {
26
26
  case 1:
27
27
  _state.trys.push([
28
28
  1,
29
+ 6,
29
30
  7,
30
- 8,
31
- 9
31
+ 8
32
32
  ]);
33
33
  _iterator = paths[Symbol.iterator]();
34
34
  _state.label = 2;
@@ -36,7 +36,7 @@ var findAppModule = function() {
36
36
  if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
37
37
  return [
38
38
  3,
39
- 6
39
+ 5
40
40
  ];
41
41
  filename = _step.value;
42
42
  return [
@@ -44,44 +44,37 @@ var findAppModule = function() {
44
44
  fs.pathExists(filename)
45
45
  ];
46
46
  case 3:
47
- if (!_state.sent())
47
+ if (_state.sent()) {
48
+ delete require.cache[filename];
48
49
  return [
49
- 3,
50
- 5
50
+ 2,
51
+ [
52
+ compatRequire(filename),
53
+ require(filename)
54
+ ]
51
55
  ];
52
- delete require.cache[filename];
53
- return [
54
- 4,
55
- compatibleRequire(filename)
56
- ];
56
+ }
57
+ _state.label = 4;
57
58
  case 4:
58
- return [
59
- 2,
60
- [
61
- _state.sent(),
62
- require(filename)
63
- ]
64
- ];
65
- case 5:
66
59
  _iteratorNormalCompletion = true;
67
60
  return [
68
61
  3,
69
62
  2
70
63
  ];
71
- case 6:
64
+ case 5:
72
65
  return [
73
66
  3,
74
- 9
67
+ 8
75
68
  ];
76
- case 7:
69
+ case 6:
77
70
  err = _state.sent();
78
71
  _didIteratorError = true;
79
72
  _iteratorError = err;
80
73
  return [
81
74
  3,
82
- 9
75
+ 8
83
76
  ];
84
- case 8:
77
+ case 7:
85
78
  try {
86
79
  if (!_iteratorNormalCompletion && _iterator.return != null) {
87
80
  _iterator.return();
@@ -94,7 +87,7 @@ var findAppModule = function() {
94
87
  return [
95
88
  7
96
89
  ];
97
- case 9:
90
+ case 8:
98
91
  return [
99
92
  2,
100
93
  []
@@ -106,95 +99,12 @@ var findAppModule = function() {
106
99
  return _ref.apply(this, arguments);
107
100
  };
108
101
  }();
109
- var initMiddlewares = function() {
110
- var _ref = _async_to_generator(function(middleware, app) {
111
- var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, middlewareItem, middlewareFunc, _tmp, err;
112
- return _ts_generator(this, function(_state) {
113
- switch (_state.label) {
114
- case 0:
115
- _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
116
- _state.label = 1;
117
- case 1:
118
- _state.trys.push([
119
- 1,
120
- 8,
121
- 9,
122
- 10
123
- ]);
124
- _iterator = middleware[Symbol.iterator]();
125
- _state.label = 2;
126
- case 2:
127
- if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
128
- return [
129
- 3,
130
- 7
131
- ];
132
- middlewareItem = _step.value;
133
- if (!(typeof middlewareItem === "string"))
134
- return [
135
- 3,
136
- 4
137
- ];
138
- return [
139
- 4,
140
- compatibleRequire(middlewareItem)
141
- ];
142
- case 3:
143
- _tmp = _state.sent();
144
- return [
145
- 3,
146
- 5
147
- ];
148
- case 4:
149
- _tmp = middlewareItem;
150
- _state.label = 5;
151
- case 5:
152
- middlewareFunc = _tmp;
153
- app.use(middlewareFunc);
154
- _state.label = 6;
155
- case 6:
156
- _iteratorNormalCompletion = true;
157
- return [
158
- 3,
159
- 2
160
- ];
161
- case 7:
162
- return [
163
- 3,
164
- 10
165
- ];
166
- case 8:
167
- err = _state.sent();
168
- _didIteratorError = true;
169
- _iteratorError = err;
170
- return [
171
- 3,
172
- 10
173
- ];
174
- case 9:
175
- try {
176
- if (!_iteratorNormalCompletion && _iterator.return != null) {
177
- _iterator.return();
178
- }
179
- } finally {
180
- if (_didIteratorError) {
181
- throw _iteratorError;
182
- }
183
- }
184
- return [
185
- 7
186
- ];
187
- case 10:
188
- return [
189
- 2
190
- ];
191
- }
192
- });
102
+ var initMiddlewares = function(middleware, app) {
103
+ middleware.forEach(function(middlewareItem) {
104
+ var middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
105
+ app.use(middlewareFunc);
193
106
  });
194
- return function initMiddlewares2(middleware, app) {
195
- return _ref.apply(this, arguments);
196
- };
197
- }();
107
+ };
198
108
  var useRun = function(app) {
199
109
  app.use(function(req, res, next) {
200
110
  run({
@@ -213,7 +123,7 @@ var createApp = function() {
213
123
  if (!(mode === "framework"))
214
124
  return [
215
125
  3,
216
- 4
126
+ 2
217
127
  ];
218
128
  return [
219
129
  4,
@@ -227,19 +137,9 @@ var createApp = function() {
227
137
  app = express();
228
138
  }
229
139
  initApp(app);
230
- if (!(middlewares && middlewares.length > 0))
231
- return [
232
- 3,
233
- 3
234
- ];
235
- return [
236
- 4,
237
- initMiddlewares(middlewares, app)
238
- ];
239
- case 2:
240
- _state.sent();
241
- _state.label = 3;
242
- case 3:
140
+ if (middlewares && middlewares.length > 0) {
141
+ initMiddlewares(middlewares, app);
142
+ }
243
143
  useRun(app);
244
144
  registerRoutes(app, apiHandlerInfos);
245
145
  if (hooks) {
@@ -250,38 +150,22 @@ var createApp = function() {
250
150
  }
251
151
  return [
252
152
  3,
253
- 8
254
- ];
255
- case 4:
256
- if (!(mode === "function"))
257
- return [
258
- 3,
259
- 7
260
- ];
261
- app = express();
262
- initApp(app);
263
- if (!(middlewares && middlewares.length > 0))
264
- return [
265
- 3,
266
- 6
267
- ];
268
- return [
269
- 4,
270
- initMiddlewares(middlewares, app)
153
+ 3
271
154
  ];
272
- case 5:
273
- _state.sent();
274
- _state.label = 6;
275
- case 6:
276
- useRun(app);
277
- registerRoutes(app, apiHandlerInfos);
278
- return [
279
- 3,
280
- 8
281
- ];
282
- case 7:
283
- throw new Error("mode must be function or framework");
284
- case 8:
155
+ case 2:
156
+ if (mode === "function") {
157
+ app = express();
158
+ initApp(app);
159
+ if (middlewares && middlewares.length > 0) {
160
+ initMiddlewares(middlewares, app);
161
+ }
162
+ useRun(app);
163
+ registerRoutes(app, apiHandlerInfos);
164
+ } else {
165
+ throw new Error("mode must be function or framework");
166
+ }
167
+ _state.label = 3;
168
+ case 3:
285
169
  if (render) {
286
170
  app.use(function() {
287
171
  var _ref2 = _async_to_generator(function(req, res, next) {
package/dist/esm-node/plugin.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as path from "path";
2
2
  import express from "express";
3
3
  import cookieParser from "cookie-parser";
4
- import { compatibleRequire, fs, logger } from "@modern-js/utils";
4
+ import { fs, compatRequire, logger } from "@modern-js/utils";
5
5
  import finalhandler from "finalhandler";
6
6
  import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
7
7
  import { run } from "./context";
@@ -16,18 +16,18 @@ const findAppModule = async (apiDir) => {
16
16
  if (await fs.pathExists(filename)) {
17
17
  delete require.cache[filename];
18
18
  return [
19
- await compatibleRequire(filename),
19
+ compatRequire(filename),
20
20
  require(filename)
21
21
  ];
22
22
  }
23
23
  }
24
24
  return [];
25
25
  };
26
- const initMiddlewares = async (middleware, app) => {
27
- for (const middlewareItem of middleware) {
28
- const middlewareFunc = typeof middlewareItem === "string" ? await compatibleRequire(middlewareItem) : middlewareItem;
26
+ const initMiddlewares = (middleware, app) => {
27
+ middleware.forEach((middlewareItem) => {
28
+ const middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
29
29
  app.use(middlewareFunc);
30
- }
30
+ });
31
31
  };
32
32
  const useRun = (app) => {
33
33
  app.use((req, res, next) => {
@@ -48,7 +48,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
48
48
  }
49
49
  initApp(app);
50
50
  if (middlewares && middlewares.length > 0) {
51
- await initMiddlewares(middlewares, app);
51
+ initMiddlewares(middlewares, app);
52
52
  }
53
53
  useRun(app);
54
54
  registerRoutes(app, apiHandlerInfos);
@@ -62,7 +62,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
62
62
  app = express();
63
63
  initApp(app);
64
64
  if (middlewares && middlewares.length > 0) {
65
- await initMiddlewares(middlewares, app);
65
+ initMiddlewares(middlewares, app);
66
66
  }
67
67
  useRun(app);
68
68
  registerRoutes(app, apiHandlerInfos);
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.57.1-alpha.0",
18
+ "version": "2.58.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/cli/index.d.ts",
21
21
  "main": "./dist/cjs/cli/index.js",
@@ -23,7 +23,6 @@
23
23
  "exports": {
24
24
  "./types": "./types.d.ts",
25
25
  ".": {
26
- "types": "./dist/types/cli/index.d.ts",
27
26
  "jsnext:source": "./src/cli/index.ts",
28
27
  "default": "./dist/cjs/cli/index.js"
29
28
  },
@@ -40,7 +39,6 @@
40
39
  "default": "./dist/esm/index.js"
41
40
  },
42
41
  "./runtime": {
43
- "types": "./dist/types/runtime/index.d.ts",
44
42
  "default": "./dist/cjs/runtime/index.js"
45
43
  }
46
44
  },
@@ -51,11 +49,11 @@
51
49
  "reflect-metadata": "^0.1.13",
52
50
  "type-is": "^1.6.18",
53
51
  "@swc/helpers": "0.5.3",
54
- "@modern-js/bff-core": "2.57.0",
55
- "@modern-js/bff-runtime": "2.57.0",
56
- "@modern-js/utils": "2.57.0",
57
- "@modern-js/server-core": "2.57.0",
58
- "@modern-js/types": "2.57.0"
52
+ "@modern-js/bff-core": "2.58.0",
53
+ "@modern-js/bff-runtime": "2.58.0",
54
+ "@modern-js/utils": "2.58.0",
55
+ "@modern-js/types": "2.58.0",
56
+ "@modern-js/server-core": "2.58.0"
59
57
  },
60
58
  "devDependencies": {
61
59
  "@types/cookie-parser": "^1.4.2",
@@ -71,10 +69,10 @@
71
69
  "supertest": "^6.1.6",
72
70
  "typescript": "^5",
73
71
  "zod": "^3.22.3",
74
- "@scripts/build": "2.57.0",
75
- "@modern-js/app-tools": "2.57.1-alpha.3",
76
- "@scripts/jest-config": "2.57.0",
77
- "@modern-js/core": "2.57.0"
72
+ "@modern-js/core": "2.58.0",
73
+ "@scripts/jest-config": "2.58.0",
74
+ "@scripts/build": "2.58.0",
75
+ "@modern-js/app-tools": "2.58.0"
78
76
  },
79
77
  "peerDependencies": {
80
78
  "express": "^4.17.1"