@modern-js/plugin-express 2.15.0 → 2.17.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.
@@ -1,126 +1,133 @@
1
1
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
2
- try {
3
- var info = gen[key](arg);
4
- var value = info.value;
5
- } catch (error) {
6
- reject(error);
7
- return;
8
- }
9
- if (info.done) {
10
- resolve(value);
11
- } else {
12
- Promise.resolve(value).then(_next, _throw);
13
- }
2
+ try {
3
+ var info = gen[key](arg);
4
+ var value = info.value;
5
+ } catch (error) {
6
+ reject(error);
7
+ return;
8
+ }
9
+ if (info.done) {
10
+ resolve(value);
11
+ } else {
12
+ Promise.resolve(value).then(_next, _throw);
13
+ }
14
14
  }
15
- function _asyncToGenerator(fn) {
16
- return function() {
17
- var self = this, args = arguments;
18
- return new Promise(function(resolve, reject) {
19
- var gen = fn.apply(self, args);
20
- function _next(value) {
21
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
22
- }
23
- function _throw(err) {
24
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
25
- }
26
- _next(undefined);
27
- });
28
- };
15
+ function _async_to_generator(fn) {
16
+ return function() {
17
+ var self = this, args = arguments;
18
+ return new Promise(function(resolve, reject) {
19
+ var gen = fn.apply(self, args);
20
+ function _next(value) {
21
+ asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
22
+ }
23
+ function _throw(err) {
24
+ asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
25
+ }
26
+ _next(void 0);
27
+ });
28
+ };
29
29
  }
30
- var __generator = this && this.__generator || function(thisArg, body) {
31
- var f, y, t, g, _ = {
32
- label: 0,
33
- sent: function() {
34
- if (t[0] & 1) throw t[1];
35
- return t[1];
36
- },
37
- trys: [],
38
- ops: []
30
+ var __generator = function(thisArg, body) {
31
+ var f, y, t, g, _ = {
32
+ label: 0,
33
+ sent: function() {
34
+ if (t[0] & 1)
35
+ throw t[1];
36
+ return t[1];
37
+ },
38
+ trys: [],
39
+ ops: []
40
+ };
41
+ return g = {
42
+ next: verb(0),
43
+ "throw": verb(1),
44
+ "return": verb(2)
45
+ }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
46
+ return this;
47
+ }), g;
48
+ function verb(n) {
49
+ return function(v) {
50
+ return step([
51
+ n,
52
+ v
53
+ ]);
39
54
  };
40
- return(g = {
41
- next: verb(0),
42
- "throw": verb(1),
43
- "return": verb(2)
44
- }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
45
- return this;
46
- }), g);
47
- function verb(n) {
48
- return function(v) {
49
- return step([
50
- n,
51
- v
52
- ]);
53
- };
54
- }
55
- function step(op) {
56
- if (f) throw new TypeError("Generator is already executing.");
57
- while(_)try {
58
- 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;
59
- if (y = 0, t) op = [
60
- op[0] & 2,
61
- t.value
62
- ];
63
- switch(op[0]){
64
- case 0:
65
- case 1:
66
- t = op;
67
- break;
68
- case 4:
69
- _.label++;
70
- return {
71
- value: op[1],
72
- done: false
73
- };
74
- case 5:
75
- _.label++;
76
- y = op[1];
77
- op = [
78
- 0
79
- ];
80
- continue;
81
- case 7:
82
- op = _.ops.pop();
83
- _.trys.pop();
84
- continue;
85
- default:
86
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
87
- _ = 0;
88
- continue;
89
- }
90
- if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
91
- _.label = op[1];
92
- break;
93
- }
94
- if (op[0] === 6 && _.label < t[1]) {
95
- _.label = t[1];
96
- t = op;
97
- break;
98
- }
99
- if (t && _.label < t[2]) {
100
- _.label = t[2];
101
- _.ops.push(op);
102
- break;
103
- }
104
- if (t[2]) _.ops.pop();
105
- _.trys.pop();
106
- continue;
107
- }
108
- op = body.call(thisArg, _);
109
- } catch (e) {
55
+ }
56
+ function step(op) {
57
+ if (f)
58
+ throw new TypeError("Generator is already executing.");
59
+ while (_)
60
+ try {
61
+ 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)
62
+ return t;
63
+ if (y = 0, t)
64
+ op = [
65
+ op[0] & 2,
66
+ t.value
67
+ ];
68
+ switch (op[0]) {
69
+ case 0:
70
+ case 1:
71
+ t = op;
72
+ break;
73
+ case 4:
74
+ _.label++;
75
+ return {
76
+ value: op[1],
77
+ done: false
78
+ };
79
+ case 5:
80
+ _.label++;
81
+ y = op[1];
110
82
  op = [
111
- 6,
112
- e
83
+ 0
113
84
  ];
114
- y = 0;
115
- } finally{
116
- f = t = 0;
85
+ continue;
86
+ case 7:
87
+ op = _.ops.pop();
88
+ _.trys.pop();
89
+ continue;
90
+ default:
91
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
92
+ _ = 0;
93
+ continue;
94
+ }
95
+ if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
96
+ _.label = op[1];
97
+ break;
98
+ }
99
+ if (op[0] === 6 && _.label < t[1]) {
100
+ _.label = t[1];
101
+ t = op;
102
+ break;
103
+ }
104
+ if (t && _.label < t[2]) {
105
+ _.label = t[2];
106
+ _.ops.push(op);
107
+ break;
108
+ }
109
+ if (t[2])
110
+ _.ops.pop();
111
+ _.trys.pop();
112
+ continue;
117
113
  }
118
- if (op[0] & 5) throw op[1];
119
- return {
120
- value: op[0] ? op[1] : void 0,
121
- done: true
122
- };
123
- }
114
+ op = body.call(thisArg, _);
115
+ } catch (e) {
116
+ op = [
117
+ 6,
118
+ e
119
+ ];
120
+ y = 0;
121
+ } finally {
122
+ f = t = 0;
123
+ }
124
+ if (op[0] & 5)
125
+ throw op[1];
126
+ return {
127
+ value: op[0] ? op[1] : void 0,
128
+ done: true
129
+ };
130
+ }
124
131
  };
125
132
  import * as path from "path";
126
133
  import express from "express";
@@ -131,279 +138,281 @@ import { run } from "./context";
131
138
  import registerRoutes from "./registerRoutes";
132
139
  var debug = createDebugger("express");
133
140
  var findAppModule = function() {
134
- var _ref = _asyncToGenerator(function(apiDir) {
135
- var exts, paths, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, filename, err;
136
- return __generator(this, function(_state) {
137
- switch(_state.label){
138
- case 0:
139
- exts = [
140
- ".ts",
141
- ".js"
142
- ];
143
- paths = exts.map(function(ext) {
144
- return path.resolve(apiDir, "app".concat(ext));
145
- });
146
- _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
147
- _state.label = 1;
148
- case 1:
149
- _state.trys.push([
150
- 1,
151
- 6,
152
- 7,
153
- 8
154
- ]);
155
- _iterator = paths[Symbol.iterator]();
156
- _state.label = 2;
157
- case 2:
158
- if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
159
- 3,
160
- 5
161
- ];
162
- filename = _step.value;
163
- return [
164
- 4,
165
- fs.pathExists(filename)
166
- ];
167
- case 3:
168
- if (_state.sent()) {
169
- delete require.cache[filename];
170
- return [
171
- 2,
172
- [
173
- compatRequire(filename),
174
- require(filename)
175
- ]
176
- ];
177
- }
178
- _state.label = 4;
179
- case 4:
180
- _iteratorNormalCompletion = true;
181
- return [
182
- 3,
183
- 2
184
- ];
185
- case 5:
186
- return [
187
- 3,
188
- 8
189
- ];
190
- case 6:
191
- err = _state.sent();
192
- _didIteratorError = true;
193
- _iteratorError = err;
194
- return [
195
- 3,
196
- 8
197
- ];
198
- case 7:
199
- try {
200
- if (!_iteratorNormalCompletion && _iterator.return != null) {
201
- _iterator.return();
202
- }
203
- } finally{
204
- if (_didIteratorError) {
205
- throw _iteratorError;
206
- }
207
- }
208
- return [
209
- 7
210
- ];
211
- case 8:
212
- return [
213
- 2,
214
- []
215
- ];
141
+ var _ref = _async_to_generator(function(apiDir) {
142
+ var exts, paths, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, filename, err;
143
+ return __generator(this, function(_state) {
144
+ switch (_state.label) {
145
+ case 0:
146
+ exts = [
147
+ ".ts",
148
+ ".js"
149
+ ];
150
+ paths = exts.map(function(ext) {
151
+ return path.resolve(apiDir, "app".concat(ext));
152
+ });
153
+ _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
154
+ _state.label = 1;
155
+ case 1:
156
+ _state.trys.push([
157
+ 1,
158
+ 6,
159
+ 7,
160
+ 8
161
+ ]);
162
+ _iterator = paths[Symbol.iterator]();
163
+ _state.label = 2;
164
+ case 2:
165
+ if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
166
+ return [
167
+ 3,
168
+ 5
169
+ ];
170
+ filename = _step.value;
171
+ return [
172
+ 4,
173
+ fs.pathExists(filename)
174
+ ];
175
+ case 3:
176
+ if (_state.sent()) {
177
+ delete require.cache[filename];
178
+ return [
179
+ 2,
180
+ [
181
+ compatRequire(filename),
182
+ require(filename)
183
+ ]
184
+ ];
185
+ }
186
+ _state.label = 4;
187
+ case 4:
188
+ _iteratorNormalCompletion = true;
189
+ return [
190
+ 3,
191
+ 2
192
+ ];
193
+ case 5:
194
+ return [
195
+ 3,
196
+ 8
197
+ ];
198
+ case 6:
199
+ err = _state.sent();
200
+ _didIteratorError = true;
201
+ _iteratorError = err;
202
+ return [
203
+ 3,
204
+ 8
205
+ ];
206
+ case 7:
207
+ try {
208
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
209
+ _iterator.return();
216
210
  }
217
- });
211
+ } finally {
212
+ if (_didIteratorError) {
213
+ throw _iteratorError;
214
+ }
215
+ }
216
+ return [
217
+ 7
218
+ ];
219
+ case 8:
220
+ return [
221
+ 2,
222
+ []
223
+ ];
224
+ }
218
225
  });
219
- return function findAppModule(apiDir) {
220
- return _ref.apply(this, arguments);
221
- };
226
+ });
227
+ return function findAppModule2(apiDir) {
228
+ return _ref.apply(this, arguments);
229
+ };
222
230
  }();
223
231
  var initMiddlewares = function(middleware, app) {
224
- middleware.forEach(function(middlewareItem) {
225
- var middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
226
- app.use(middlewareFunc);
227
- });
232
+ middleware.forEach(function(middlewareItem) {
233
+ var middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
234
+ app.use(middlewareFunc);
235
+ });
228
236
  };
229
237
  var useRun = function(app) {
230
- app.use(function(req, res, next) {
231
- run({
232
- req: req,
233
- res: res
234
- }, next);
235
- });
238
+ app.use(function(req, res, next) {
239
+ run({
240
+ req,
241
+ res
242
+ }, next);
243
+ });
236
244
  };
237
245
  var initApp = function(app) {
238
- app.use(cookieParser());
239
- app.use(express.text());
240
- app.use(express.urlencoded({
241
- extended: true
242
- }));
243
- app.use(express.json());
244
- return app;
246
+ app.use(cookieParser());
247
+ app.use(express.text());
248
+ app.use(express.urlencoded({
249
+ extended: true
250
+ }));
251
+ app.use(express.json());
252
+ return app;
245
253
  };
246
- var plugin_default = function() {
247
- return {
248
- name: "@modern-js/plugin-express",
249
- pre: [
250
- "@modern-js/plugin-bff"
251
- ],
252
- post: [
253
- "@modern-js/plugin-server"
254
- ],
255
- setup: function(api) {
256
- return {
257
- prepareApiServer: function prepareApiServer(param) {
258
- var pwd = param.pwd, config = param.config, render = param.render;
259
- return _asyncToGenerator(function() {
260
- var _userConfig_bff, app, appContext, apiHandlerInfos, apiDirectory, apiDir, mode, userConfig, appModule, hooks, middleware, afterLambdaRegisted, middleware1;
261
- return __generator(this, function(_state) {
262
- switch(_state.label){
263
- case 0:
264
- appContext = api.useAppContext();
265
- apiHandlerInfos = appContext.apiHandlerInfos;
266
- apiDirectory = appContext.apiDirectory;
267
- apiDir = apiDirectory || path.join(pwd, "./api");
268
- mode = appContext.apiMode;
269
- userConfig = api.useConfigContext();
270
- if (!(mode === "framework")) return [
271
- 3,
272
- 2
273
- ];
274
- return [
275
- 4,
276
- findAppModule(apiDir)
277
- ];
278
- case 1:
279
- appModule = _state.sent();
280
- app = appModule[0];
281
- hooks = appModule[1];
282
- if (!app || !app.use) {
283
- app = express();
284
- }
285
- initApp(app);
286
- if (config) {
287
- middleware = config.middleware;
288
- initMiddlewares(middleware, app);
289
- }
290
- useRun(app);
291
- registerRoutes(app, apiHandlerInfos);
292
- if (hooks) {
293
- afterLambdaRegisted = hooks.afterLambdaRegisted;
294
- if (afterLambdaRegisted) {
295
- afterLambdaRegisted(app);
296
- }
297
- }
298
- return [
299
- 3,
300
- 3
301
- ];
302
- case 2:
303
- if (mode === "function") {
304
- app = express();
305
- initApp(app);
306
- if (config) {
307
- middleware1 = config.middleware;
308
- initMiddlewares(middleware1, app);
309
- }
310
- useRun(app);
311
- registerRoutes(app, apiHandlerInfos);
312
- } else {
313
- throw new Error("mode must be function or framework");
314
- }
315
- _state.label = 3;
316
- case 3:
317
- if (((_userConfig_bff = userConfig.bff) === null || _userConfig_bff === void 0 ? void 0 : _userConfig_bff.enableHandleWeb) && render) {
318
- app.use(function() {
319
- var _ref = _asyncToGenerator(function(req, res, next) {
320
- var html;
321
- return __generator(this, function(_state) {
322
- switch(_state.label){
323
- case 0:
324
- return [
325
- 4,
326
- render(req, res)
327
- ];
328
- case 1:
329
- html = _state.sent();
330
- if (html) {
331
- res.end(html);
332
- }
333
- next();
334
- return [
335
- 2
336
- ];
337
- }
338
- });
339
- });
340
- return function(req, res, next) {
341
- return _ref.apply(this, arguments);
342
- };
343
- }());
344
- }
345
- return [
346
- 2,
347
- function(req, res) {
348
- return new Promise(function(resolve, reject) {
349
- var handler = function(err) {
350
- if (err) {
351
- return reject(err);
352
- }
353
- return finalhandler(req, res, {})(null);
354
- };
355
- res.on("finish", function(err) {
356
- if (err) {
357
- return reject(err);
358
- }
359
- return resolve();
360
- });
361
- return app(req, res, handler);
362
- });
363
- }
364
- ];
365
- }
366
- });
367
- })();
368
- },
369
- prepareWebServer: function prepareWebServer(param, next) {
370
- var config = param.config;
371
- var _userConfig_server;
372
- var userConfig = api.useConfigContext();
373
- if (!(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_server = userConfig.server) === null || _userConfig_server === void 0 ? void 0 : _userConfig_server.enableFrameworkExt)) {
374
- return next();
254
+ export default function() {
255
+ return {
256
+ name: "@modern-js/plugin-express",
257
+ pre: [
258
+ "@modern-js/plugin-bff"
259
+ ],
260
+ post: [
261
+ "@modern-js/plugin-server"
262
+ ],
263
+ setup: function(api) {
264
+ return {
265
+ prepareApiServer: function prepareApiServer(param) {
266
+ var pwd = param.pwd, config = param.config, render = param.render;
267
+ return _async_to_generator(function() {
268
+ var _userConfig_bff, app, appContext, apiHandlerInfos, apiDirectory, apiDir, mode, userConfig, appModule, hooks, middleware, afterLambdaRegisted, middleware1;
269
+ return __generator(this, function(_state) {
270
+ switch (_state.label) {
271
+ case 0:
272
+ appContext = api.useAppContext();
273
+ apiHandlerInfos = appContext.apiHandlerInfos;
274
+ apiDirectory = appContext.apiDirectory;
275
+ apiDir = apiDirectory || path.join(pwd, "./api");
276
+ mode = appContext.apiMode;
277
+ userConfig = api.useConfigContext();
278
+ if (!(mode === "framework"))
279
+ return [
280
+ 3,
281
+ 2
282
+ ];
283
+ return [
284
+ 4,
285
+ findAppModule(apiDir)
286
+ ];
287
+ case 1:
288
+ appModule = _state.sent();
289
+ app = appModule[0];
290
+ hooks = appModule[1];
291
+ if (!app || !app.use) {
292
+ app = express();
293
+ }
294
+ initApp(app);
295
+ if (config) {
296
+ middleware = config.middleware;
297
+ initMiddlewares(middleware, app);
298
+ }
299
+ useRun(app);
300
+ registerRoutes(app, apiHandlerInfos);
301
+ if (hooks) {
302
+ afterLambdaRegisted = hooks.afterLambdaRegisted;
303
+ if (afterLambdaRegisted) {
304
+ afterLambdaRegisted(app);
375
305
  }
376
- var app = express();
306
+ }
307
+ return [
308
+ 3,
309
+ 3
310
+ ];
311
+ case 2:
312
+ if (mode === "function") {
313
+ app = express();
377
314
  initApp(app);
378
315
  if (config) {
379
- var middleware = config.middleware;
380
- debug("web middleware", middleware);
381
- initMiddlewares(middleware, app);
316
+ middleware1 = config.middleware;
317
+ initMiddlewares(middleware1, app);
382
318
  }
383
- return function(ctx) {
384
- return new Promise(function(resolve, reject) {
385
- var _ctx_source = ctx.source, req = _ctx_source.req, res = _ctx_source.res;
386
- var handler = function(err) {
387
- if (err) {
388
- return reject(err);
389
- }
390
- if (res.headersSent && res.statusCode !== 200) {
391
- finalhandler(req, res, {})(null);
392
- }
393
- return resolve();
394
- };
395
- res.on("finish", function(err) {
396
- if (err) {
397
- return reject(err);
398
- }
399
- return resolve();
400
- });
401
- return app(req, res, handler);
319
+ useRun(app);
320
+ registerRoutes(app, apiHandlerInfos);
321
+ } else {
322
+ throw new Error("mode must be function or framework");
323
+ }
324
+ _state.label = 3;
325
+ case 3:
326
+ if (((_userConfig_bff = userConfig.bff) === null || _userConfig_bff === void 0 ? void 0 : _userConfig_bff.enableHandleWeb) && render) {
327
+ app.use(function() {
328
+ var _ref = _async_to_generator(function(req, res, next) {
329
+ var html;
330
+ return __generator(this, function(_state2) {
331
+ switch (_state2.label) {
332
+ case 0:
333
+ return [
334
+ 4,
335
+ render(req, res)
336
+ ];
337
+ case 1:
338
+ html = _state2.sent();
339
+ if (html) {
340
+ res.end(html);
341
+ }
342
+ next();
343
+ return [
344
+ 2
345
+ ];
346
+ }
402
347
  });
403
- };
348
+ });
349
+ return function(req, res, next) {
350
+ return _ref.apply(this, arguments);
351
+ };
352
+ }());
353
+ }
354
+ return [
355
+ 2,
356
+ function(req, res) {
357
+ return new Promise(function(resolve, reject) {
358
+ var handler = function(err) {
359
+ if (err) {
360
+ return reject(err);
361
+ }
362
+ return finalhandler(req, res, {})(null);
363
+ };
364
+ res.on("finish", function(err) {
365
+ if (err) {
366
+ return reject(err);
367
+ }
368
+ return resolve();
369
+ });
370
+ return app(req, res, handler);
371
+ });
372
+ }
373
+ ];
374
+ }
375
+ });
376
+ })();
377
+ },
378
+ prepareWebServer: function prepareWebServer(param, next) {
379
+ var config = param.config;
380
+ var _userConfig_server;
381
+ var userConfig = api.useConfigContext();
382
+ if (!(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_server = userConfig.server) === null || _userConfig_server === void 0 ? void 0 : _userConfig_server.enableFrameworkExt)) {
383
+ return next();
384
+ }
385
+ var app = express();
386
+ initApp(app);
387
+ if (config) {
388
+ var middleware = config.middleware;
389
+ debug("web middleware", middleware);
390
+ initMiddlewares(middleware, app);
391
+ }
392
+ return function(ctx) {
393
+ return new Promise(function(resolve, reject) {
394
+ var _ctx_source = ctx.source, req = _ctx_source.req, res = _ctx_source.res;
395
+ var handler = function(err) {
396
+ if (err) {
397
+ return reject(err);
404
398
  }
405
- };
399
+ if (res.headersSent && res.statusCode !== 200) {
400
+ finalhandler(req, res, {})(null);
401
+ }
402
+ return resolve();
403
+ };
404
+ res.on("finish", function(err) {
405
+ if (err) {
406
+ return reject(err);
407
+ }
408
+ return resolve();
409
+ });
410
+ return app(req, res, handler);
411
+ });
412
+ };
406
413
  }
407
- };
408
- };
409
- export { plugin_default as default };
414
+ };
415
+ }
416
+ };
417
+ }
418
+ ;