wapplr 1.0.78 → 1.0.79
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.
- package/dist/client/app.js +44 -57
- package/dist/client/createClient.js +47 -57
- package/dist/client/middlewares.js +32 -40
- package/dist/common/contents.js +29 -38
- package/dist/common/middlewares.js +3 -3
- package/dist/common/requests.js +30 -35
- package/dist/common/router.js +33 -45
- package/dist/common/states.js +18 -7
- package/dist/server/app.js +44 -57
- package/dist/server/createServer.js +47 -57
- package/dist/server/middlewares.js +2 -2
- package/dist/server/static.js +38 -39
- package/package.json +1 -1
package/dist/client/app.js
CHANGED
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports["default"] = createApp;
|
|
8
8
|
var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
|
|
9
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
10
|
-
var
|
|
10
|
+
var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
|
|
11
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
12
12
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
13
|
var _utils = require("../common/utils");
|
|
@@ -48,60 +48,56 @@ function createApp() {
|
|
|
48
48
|
return _defaultHandle.apply(this, arguments);
|
|
49
49
|
}
|
|
50
50
|
function _defaultHandle() {
|
|
51
|
-
_defaultHandle = (0, _asyncToGenerator2["default"])(
|
|
51
|
+
_defaultHandle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(req, res, out) {
|
|
52
52
|
var middlewares, index, next, _next;
|
|
53
|
-
return (0,
|
|
54
|
-
while (1) switch (_context3.
|
|
53
|
+
return (0, _regenerator2["default"])().w(function (_context3) {
|
|
54
|
+
while (1) switch (_context3.n) {
|
|
55
55
|
case 0:
|
|
56
56
|
_next = function _next3() {
|
|
57
|
-
_next = (0, _asyncToGenerator2["default"])(
|
|
58
|
-
var func, defaultArgs, args, requestMethod, requestUrl;
|
|
59
|
-
return (0,
|
|
60
|
-
while (1) switch (_context2.
|
|
57
|
+
_next = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(err) {
|
|
58
|
+
var func, defaultArgs, args, requestMethod, requestUrl, _t;
|
|
59
|
+
return (0, _regenerator2["default"])().w(function (_context2) {
|
|
60
|
+
while (1) switch (_context2.p = _context2.n) {
|
|
61
61
|
case 0:
|
|
62
62
|
if (!middlewares[index]) {
|
|
63
|
-
_context2.
|
|
63
|
+
_context2.n = 5;
|
|
64
64
|
break;
|
|
65
65
|
}
|
|
66
66
|
func = middlewares[index];
|
|
67
67
|
index = index + 1;
|
|
68
|
-
defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(
|
|
69
|
-
return (0,
|
|
70
|
-
while (1) switch (_context.
|
|
68
|
+
defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
|
|
69
|
+
return (0, _regenerator2["default"])().w(function (_context) {
|
|
70
|
+
while (1) switch (_context.n) {
|
|
71
71
|
case 0:
|
|
72
|
-
_context.
|
|
72
|
+
_context.n = 1;
|
|
73
73
|
return next(err);
|
|
74
|
-
case
|
|
75
|
-
|
|
76
|
-
return _context.stop();
|
|
74
|
+
case 1:
|
|
75
|
+
return _context.a(2);
|
|
77
76
|
}
|
|
78
77
|
}, _callee);
|
|
79
78
|
})) : next];
|
|
80
79
|
args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
|
|
81
|
-
_context2.
|
|
82
|
-
_context2.
|
|
80
|
+
_context2.p = 1;
|
|
81
|
+
_context2.n = 2;
|
|
83
82
|
return func.apply(void 0, (0, _toConsumableArray2["default"])(args));
|
|
84
|
-
case
|
|
85
|
-
return _context2.
|
|
86
|
-
case
|
|
87
|
-
_context2.
|
|
88
|
-
|
|
89
|
-
res.status(500,
|
|
90
|
-
_context2.
|
|
91
|
-
return next(
|
|
92
|
-
case
|
|
93
|
-
return _context2.
|
|
94
|
-
case
|
|
95
|
-
_context2.next = 25;
|
|
96
|
-
break;
|
|
97
|
-
case 19:
|
|
83
|
+
case 2:
|
|
84
|
+
return _context2.a(2, _context2.v);
|
|
85
|
+
case 3:
|
|
86
|
+
_context2.p = 3;
|
|
87
|
+
_t = _context2.v;
|
|
88
|
+
res.status(500, _t);
|
|
89
|
+
_context2.n = 4;
|
|
90
|
+
return next(_t);
|
|
91
|
+
case 4:
|
|
92
|
+
return _context2.a(2, _context2.v);
|
|
93
|
+
case 5:
|
|
98
94
|
if (!(typeof out === "function")) {
|
|
99
|
-
_context2.
|
|
95
|
+
_context2.n = 6;
|
|
100
96
|
break;
|
|
101
97
|
}
|
|
102
98
|
index = 0;
|
|
103
|
-
return _context2.
|
|
104
|
-
case
|
|
99
|
+
return _context2.a(2, out(err));
|
|
100
|
+
case 6:
|
|
105
101
|
if (err) {
|
|
106
102
|
index = 0;
|
|
107
103
|
app.errorHandler(err, req, res, out);
|
|
@@ -112,13 +108,10 @@ function createApp() {
|
|
|
112
108
|
requestUrl = req.url;
|
|
113
109
|
res.send(requestMethod + " " + requestUrl);
|
|
114
110
|
}
|
|
115
|
-
case
|
|
116
|
-
return _context2.
|
|
117
|
-
case 26:
|
|
118
|
-
case "end":
|
|
119
|
-
return _context2.stop();
|
|
111
|
+
case 7:
|
|
112
|
+
return _context2.a(2, null);
|
|
120
113
|
}
|
|
121
|
-
}, _callee2, null, [[
|
|
114
|
+
}, _callee2, null, [[1, 3]]);
|
|
122
115
|
}));
|
|
123
116
|
return _next.apply(this, arguments);
|
|
124
117
|
};
|
|
@@ -127,13 +120,10 @@ function createApp() {
|
|
|
127
120
|
};
|
|
128
121
|
middlewares = app.middlewares;
|
|
129
122
|
index = 0;
|
|
130
|
-
_context3.
|
|
123
|
+
_context3.n = 1;
|
|
131
124
|
return next();
|
|
132
|
-
case
|
|
133
|
-
return _context3.
|
|
134
|
-
case 7:
|
|
135
|
-
case "end":
|
|
136
|
-
return _context3.stop();
|
|
125
|
+
case 1:
|
|
126
|
+
return _context3.a(2, _context3.v);
|
|
137
127
|
}
|
|
138
128
|
}, _callee3);
|
|
139
129
|
}));
|
|
@@ -173,7 +163,7 @@ function createApp() {
|
|
|
173
163
|
return _app.apply(this, arguments);
|
|
174
164
|
}
|
|
175
165
|
function _app() {
|
|
176
|
-
_app = (0, _asyncToGenerator2["default"])(
|
|
166
|
+
_app = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee4() {
|
|
177
167
|
var req,
|
|
178
168
|
res,
|
|
179
169
|
next,
|
|
@@ -184,14 +174,14 @@ function createApp() {
|
|
|
184
174
|
fullUrl,
|
|
185
175
|
defaultOut,
|
|
186
176
|
_args4 = arguments;
|
|
187
|
-
return (0,
|
|
188
|
-
while (1) switch (_context4.
|
|
177
|
+
return (0, _regenerator2["default"])().w(function (_context4) {
|
|
178
|
+
while (1) switch (_context4.n) {
|
|
189
179
|
case 0:
|
|
190
180
|
req = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
|
|
191
181
|
res = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
|
|
192
182
|
next = _args4.length > 2 ? _args4[2] : undefined;
|
|
193
183
|
if (!(typeof app.handle === "function")) {
|
|
194
|
-
_context4.
|
|
184
|
+
_context4.n = 1;
|
|
195
185
|
break;
|
|
196
186
|
}
|
|
197
187
|
// these properties what usually there are in req and res
|
|
@@ -272,13 +262,10 @@ function createApp() {
|
|
|
272
262
|
res.send(requestMethod + " " + requestUrl);
|
|
273
263
|
}
|
|
274
264
|
};
|
|
275
|
-
_context4.
|
|
265
|
+
_context4.n = 1;
|
|
276
266
|
return app.handle(req, res, next || defaultOut);
|
|
277
|
-
case
|
|
278
|
-
return _context4.
|
|
279
|
-
case 25:
|
|
280
|
-
case "end":
|
|
281
|
-
return _context4.stop();
|
|
267
|
+
case 1:
|
|
268
|
+
return _context4.a(2, app);
|
|
282
269
|
}
|
|
283
270
|
}, _callee4);
|
|
284
271
|
}));
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports["default"] = createClient;
|
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
|
-
var
|
|
9
|
+
var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
@@ -117,71 +117,64 @@ function createClient() {
|
|
|
117
117
|
Object.defineProperty(wapp, "client", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
118
118
|
value: wapplrClient
|
|
119
119
|
}));
|
|
120
|
-
app.use(
|
|
121
|
-
var _defaultMiddlewaresWrapper = (0, _asyncToGenerator2["default"])(
|
|
122
|
-
var
|
|
123
|
-
return (0,
|
|
124
|
-
while (1) switch (_context3.
|
|
120
|
+
app.use(/*#__PURE__*/function () {
|
|
121
|
+
var _defaultMiddlewaresWrapper = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(req, res, out) {
|
|
122
|
+
var _next, middlewares, index;
|
|
123
|
+
return (0, _regenerator2["default"])().w(function (_context3) {
|
|
124
|
+
while (1) switch (_context3.n) {
|
|
125
125
|
case 0:
|
|
126
126
|
if (wapplrClient.config.disableUseDefaultMiddlewares) {
|
|
127
|
-
_context3.
|
|
127
|
+
_context3.n = 2;
|
|
128
128
|
break;
|
|
129
129
|
}
|
|
130
|
-
|
|
131
|
-
var _ref2 = (0, _asyncToGenerator2["default"])(
|
|
132
|
-
var func, defaultArgs, args;
|
|
133
|
-
return (0,
|
|
134
|
-
while (1) switch (_context2.
|
|
130
|
+
_next = /*#__PURE__*/function () {
|
|
131
|
+
var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(err) {
|
|
132
|
+
var func, defaultArgs, args, _t;
|
|
133
|
+
return (0, _regenerator2["default"])().w(function (_context2) {
|
|
134
|
+
while (1) switch (_context2.p = _context2.n) {
|
|
135
135
|
case 0:
|
|
136
136
|
if (!middlewares[index]) {
|
|
137
|
-
_context2.
|
|
137
|
+
_context2.n = 5;
|
|
138
138
|
break;
|
|
139
139
|
}
|
|
140
140
|
func = middlewares[index];
|
|
141
141
|
index = index + 1;
|
|
142
|
-
defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(
|
|
143
|
-
return (0,
|
|
144
|
-
while (1) switch (_context.
|
|
142
|
+
defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
|
|
143
|
+
return (0, _regenerator2["default"])().w(function (_context) {
|
|
144
|
+
while (1) switch (_context.n) {
|
|
145
145
|
case 0:
|
|
146
|
-
_context.
|
|
147
|
-
return
|
|
148
|
-
case
|
|
149
|
-
|
|
150
|
-
return _context.stop();
|
|
146
|
+
_context.n = 1;
|
|
147
|
+
return _next(err);
|
|
148
|
+
case 1:
|
|
149
|
+
return _context.a(2);
|
|
151
150
|
}
|
|
152
151
|
}, _callee);
|
|
153
|
-
})) :
|
|
152
|
+
})) : _next];
|
|
154
153
|
args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
|
|
155
|
-
_context2.
|
|
156
|
-
_context2.
|
|
154
|
+
_context2.p = 1;
|
|
155
|
+
_context2.n = 2;
|
|
157
156
|
return func.apply(void 0, (0, _toConsumableArray2["default"])(args));
|
|
158
|
-
case
|
|
159
|
-
return _context2.
|
|
160
|
-
case
|
|
161
|
-
_context2.
|
|
162
|
-
|
|
163
|
-
res.wappResponse.status(500,
|
|
164
|
-
_context2.
|
|
165
|
-
return
|
|
166
|
-
case
|
|
167
|
-
return _context2.
|
|
168
|
-
case
|
|
169
|
-
_context2.next = 22;
|
|
170
|
-
break;
|
|
171
|
-
case 19:
|
|
157
|
+
case 2:
|
|
158
|
+
return _context2.a(2, _context2.v);
|
|
159
|
+
case 3:
|
|
160
|
+
_context2.p = 3;
|
|
161
|
+
_t = _context2.v;
|
|
162
|
+
res.wappResponse.status(500, _t);
|
|
163
|
+
_context2.n = 4;
|
|
164
|
+
return _next(_t);
|
|
165
|
+
case 4:
|
|
166
|
+
return _context2.a(2, _context2.v);
|
|
167
|
+
case 5:
|
|
172
168
|
if (!(typeof out === "function")) {
|
|
173
|
-
_context2.
|
|
169
|
+
_context2.n = 6;
|
|
174
170
|
break;
|
|
175
171
|
}
|
|
176
172
|
index = 0;
|
|
177
|
-
return _context2.
|
|
178
|
-
case
|
|
179
|
-
return _context2.
|
|
180
|
-
case 23:
|
|
181
|
-
case "end":
|
|
182
|
-
return _context2.stop();
|
|
173
|
+
return _context2.a(2, out(err));
|
|
174
|
+
case 6:
|
|
175
|
+
return _context2.a(2, null);
|
|
183
176
|
}
|
|
184
|
-
}, _callee2, null, [[
|
|
177
|
+
}, _callee2, null, [[1, 3]]);
|
|
185
178
|
}));
|
|
186
179
|
return function next(_x4) {
|
|
187
180
|
return _ref2.apply(this, arguments);
|
|
@@ -191,18 +184,15 @@ function createClient() {
|
|
|
191
184
|
return wapplrClient.middlewares[key];
|
|
192
185
|
});
|
|
193
186
|
index = 0;
|
|
194
|
-
_context3.
|
|
195
|
-
return
|
|
196
|
-
case
|
|
197
|
-
return _context3.
|
|
198
|
-
case
|
|
199
|
-
_context3.
|
|
187
|
+
_context3.n = 1;
|
|
188
|
+
return _next();
|
|
189
|
+
case 1:
|
|
190
|
+
return _context3.a(2, _context3.v);
|
|
191
|
+
case 2:
|
|
192
|
+
_context3.n = 3;
|
|
200
193
|
return out();
|
|
201
|
-
case
|
|
202
|
-
return _context3.
|
|
203
|
-
case 10:
|
|
204
|
-
case "end":
|
|
205
|
-
return _context3.stop();
|
|
194
|
+
case 3:
|
|
195
|
+
return _context3.a(2, _context3.v);
|
|
206
196
|
}
|
|
207
197
|
}, _callee3);
|
|
208
198
|
}));
|
|
@@ -9,7 +9,7 @@ exports.createRenderMiddleware = createRenderMiddleware;
|
|
|
9
9
|
exports.createUpdateTagsMiddleware = createUpdateTagsMiddleware;
|
|
10
10
|
exports["default"] = createMiddlewares;
|
|
11
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
12
|
-
var
|
|
12
|
+
var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
|
|
13
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
14
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
15
15
|
var _utils = require("../common/utils");
|
|
@@ -23,10 +23,10 @@ function createRenderMiddleware() {
|
|
|
23
23
|
return _defaultRenderHandle.apply(this, arguments);
|
|
24
24
|
}
|
|
25
25
|
function _defaultRenderHandle() {
|
|
26
|
-
_defaultRenderHandle = (0, _asyncToGenerator2["default"])(
|
|
26
|
+
_defaultRenderHandle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee(req, res, next) {
|
|
27
27
|
var wappResponse;
|
|
28
|
-
return (0,
|
|
29
|
-
while (1) switch (_context.
|
|
28
|
+
return (0, _regenerator2["default"])().w(function (_context) {
|
|
29
|
+
while (1) switch (_context.n) {
|
|
30
30
|
case 0:
|
|
31
31
|
wappResponse = res.wappResponse;
|
|
32
32
|
if (wappResponse.content && !wappResponse.content.renderType) {
|
|
@@ -40,9 +40,8 @@ function createRenderMiddleware() {
|
|
|
40
40
|
} else {
|
|
41
41
|
next();
|
|
42
42
|
}
|
|
43
|
-
case
|
|
44
|
-
|
|
45
|
-
return _context.stop();
|
|
43
|
+
case 1:
|
|
44
|
+
return _context.a(2);
|
|
46
45
|
}
|
|
47
46
|
}, _callee);
|
|
48
47
|
}));
|
|
@@ -52,53 +51,49 @@ function createRenderMiddleware() {
|
|
|
52
51
|
return _defaultHandle.apply(this, arguments);
|
|
53
52
|
}
|
|
54
53
|
function _defaultHandle() {
|
|
55
|
-
_defaultHandle = (0, _asyncToGenerator2["default"])(
|
|
54
|
+
_defaultHandle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee4(req, res, out) {
|
|
56
55
|
var renderMiddlewares, index, next, _next;
|
|
57
|
-
return (0,
|
|
58
|
-
while (1) switch (_context4.
|
|
56
|
+
return (0, _regenerator2["default"])().w(function (_context4) {
|
|
57
|
+
while (1) switch (_context4.n) {
|
|
59
58
|
case 0:
|
|
60
59
|
_next = function _next3() {
|
|
61
|
-
_next = (0, _asyncToGenerator2["default"])(
|
|
60
|
+
_next = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(err) {
|
|
62
61
|
var func;
|
|
63
|
-
return (0,
|
|
64
|
-
while (1) switch (_context3.
|
|
62
|
+
return (0, _regenerator2["default"])().w(function (_context3) {
|
|
63
|
+
while (1) switch (_context3.n) {
|
|
65
64
|
case 0:
|
|
66
65
|
if (!renderMiddlewares[index]) {
|
|
67
|
-
_context3.
|
|
66
|
+
_context3.n = 2;
|
|
68
67
|
break;
|
|
69
68
|
}
|
|
70
69
|
func = renderMiddlewares[index];
|
|
71
70
|
index = index + 1;
|
|
72
|
-
_context3.
|
|
73
|
-
return func(req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(
|
|
74
|
-
return (0,
|
|
75
|
-
while (1) switch (_context2.
|
|
71
|
+
_context3.n = 1;
|
|
72
|
+
return func(req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2() {
|
|
73
|
+
return (0, _regenerator2["default"])().w(function (_context2) {
|
|
74
|
+
while (1) switch (_context2.n) {
|
|
76
75
|
case 0:
|
|
77
|
-
_context2.
|
|
76
|
+
_context2.n = 1;
|
|
78
77
|
return next(err);
|
|
79
|
-
case
|
|
80
|
-
|
|
81
|
-
return _context2.stop();
|
|
78
|
+
case 1:
|
|
79
|
+
return _context2.a(2);
|
|
82
80
|
}
|
|
83
81
|
}, _callee2);
|
|
84
82
|
})) : next);
|
|
85
|
-
case
|
|
86
|
-
return _context3.
|
|
87
|
-
case
|
|
83
|
+
case 1:
|
|
84
|
+
return _context3.a(2, _context3.v);
|
|
85
|
+
case 2:
|
|
88
86
|
if (!(typeof out === "function")) {
|
|
89
|
-
_context3.
|
|
87
|
+
_context3.n = 4;
|
|
90
88
|
break;
|
|
91
89
|
}
|
|
92
90
|
index = 0;
|
|
93
|
-
_context3.
|
|
91
|
+
_context3.n = 3;
|
|
94
92
|
return out(err);
|
|
95
|
-
case
|
|
96
|
-
return _context3.
|
|
97
|
-
case
|
|
98
|
-
return _context3.
|
|
99
|
-
case 14:
|
|
100
|
-
case "end":
|
|
101
|
-
return _context3.stop();
|
|
93
|
+
case 3:
|
|
94
|
+
return _context3.a(2, _context3.v);
|
|
95
|
+
case 4:
|
|
96
|
+
return _context3.a(2, null);
|
|
102
97
|
}
|
|
103
98
|
}, _callee3);
|
|
104
99
|
}));
|
|
@@ -111,13 +106,10 @@ function createRenderMiddleware() {
|
|
|
111
106
|
return renderMiddleware.handles[key];
|
|
112
107
|
});
|
|
113
108
|
index = 0;
|
|
114
|
-
_context4.
|
|
109
|
+
_context4.n = 1;
|
|
115
110
|
return next();
|
|
116
|
-
case
|
|
117
|
-
return _context4.
|
|
118
|
-
case 7:
|
|
119
|
-
case "end":
|
|
120
|
-
return _context4.stop();
|
|
111
|
+
case 1:
|
|
112
|
+
return _context4.a(2, _context4.v);
|
|
121
113
|
}
|
|
122
114
|
}, _callee4);
|
|
123
115
|
}));
|
package/dist/common/contents.js
CHANGED
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports["default"] = createContents;
|
|
8
|
-
var
|
|
8
|
+
var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
|
|
9
9
|
var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
|
|
10
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
11
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
@@ -17,7 +17,7 @@ function createDefaultContentManager() {
|
|
|
17
17
|
return _defaultResolve.apply(this, arguments);
|
|
18
18
|
}
|
|
19
19
|
function _defaultResolve() {
|
|
20
|
-
_defaultResolve = (0, _asyncToGenerator2["default"])(
|
|
20
|
+
_defaultResolve = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
|
|
21
21
|
var p,
|
|
22
22
|
route,
|
|
23
23
|
wapp,
|
|
@@ -27,8 +27,8 @@ function createDefaultContentManager() {
|
|
|
27
27
|
contents,
|
|
28
28
|
content,
|
|
29
29
|
_args = arguments;
|
|
30
|
-
return (0,
|
|
31
|
-
while (1) switch (_context.
|
|
30
|
+
return (0, _regenerator2["default"])().w(function (_context) {
|
|
31
|
+
while (1) switch (_context.n) {
|
|
32
32
|
case 0:
|
|
33
33
|
p = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
|
|
34
34
|
route = p.route, wapp = p.wapp, req = p.req, res = p.res;
|
|
@@ -36,31 +36,28 @@ function createDefaultContentManager() {
|
|
|
36
36
|
contents = contentManager.contents;
|
|
37
37
|
content = contentName && contents[contentName] ? (0, _objectSpread2["default"])({}, contents[contentName]) : null;
|
|
38
38
|
if (!contentManager.firstRequest) {
|
|
39
|
-
_context.
|
|
39
|
+
_context.n = 1;
|
|
40
40
|
break;
|
|
41
41
|
}
|
|
42
|
-
_context.
|
|
42
|
+
_context.n = 1;
|
|
43
43
|
return contentManager.firstRequest({
|
|
44
44
|
wapp: wapp,
|
|
45
45
|
req: req,
|
|
46
46
|
res: res
|
|
47
47
|
});
|
|
48
|
-
case
|
|
48
|
+
case 1:
|
|
49
49
|
if (!(content && content.request)) {
|
|
50
|
-
_context.
|
|
50
|
+
_context.n = 2;
|
|
51
51
|
break;
|
|
52
52
|
}
|
|
53
|
-
_context.
|
|
53
|
+
_context.n = 2;
|
|
54
54
|
return content.request({
|
|
55
55
|
wapp: wapp,
|
|
56
56
|
req: req,
|
|
57
57
|
res: res
|
|
58
58
|
});
|
|
59
|
-
case
|
|
60
|
-
return _context.
|
|
61
|
-
case 12:
|
|
62
|
-
case "end":
|
|
63
|
-
return _context.stop();
|
|
59
|
+
case 2:
|
|
60
|
+
return _context.a(2, content);
|
|
64
61
|
}
|
|
65
62
|
}, _callee);
|
|
66
63
|
}));
|
|
@@ -212,30 +209,27 @@ function createContents() {
|
|
|
212
209
|
return _defaultHandle.apply(this, arguments);
|
|
213
210
|
}
|
|
214
211
|
function _defaultHandle() {
|
|
215
|
-
_defaultHandle = (0, _asyncToGenerator2["default"])(
|
|
212
|
+
_defaultHandle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(req, res, next) {
|
|
216
213
|
var contentRes;
|
|
217
|
-
return (0,
|
|
218
|
-
while (1) switch (_context2.
|
|
214
|
+
return (0, _regenerator2["default"])().w(function (_context2) {
|
|
215
|
+
while (1) switch (_context2.n) {
|
|
219
216
|
case 0:
|
|
220
217
|
if (res.wappResponse.content) {
|
|
221
|
-
_context2.
|
|
218
|
+
_context2.n = 2;
|
|
222
219
|
break;
|
|
223
220
|
}
|
|
224
221
|
contentRes = contentsMiddleware.contentManager.resolve;
|
|
225
|
-
_context2.
|
|
222
|
+
_context2.n = 1;
|
|
226
223
|
return contentRes({
|
|
227
224
|
route: res.wappResponse.route,
|
|
228
225
|
wapp: wapp,
|
|
229
226
|
req: req,
|
|
230
227
|
res: res
|
|
231
228
|
});
|
|
232
|
-
case
|
|
233
|
-
res.wappResponse.content = _context2.
|
|
234
|
-
case
|
|
235
|
-
return _context2.
|
|
236
|
-
case 6:
|
|
237
|
-
case "end":
|
|
238
|
-
return _context2.stop();
|
|
229
|
+
case 1:
|
|
230
|
+
res.wappResponse.content = _context2.v;
|
|
231
|
+
case 2:
|
|
232
|
+
return _context2.a(2, next());
|
|
239
233
|
}
|
|
240
234
|
}, _callee2);
|
|
241
235
|
}));
|
|
@@ -277,23 +271,20 @@ function createContents() {
|
|
|
277
271
|
return _contentsMiddleware.apply(this, arguments);
|
|
278
272
|
}
|
|
279
273
|
function _contentsMiddleware() {
|
|
280
|
-
_contentsMiddleware = (0, _asyncToGenerator2["default"])(
|
|
281
|
-
return (0,
|
|
282
|
-
while (1) switch (_context3.
|
|
274
|
+
_contentsMiddleware = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(req, res, next) {
|
|
275
|
+
return (0, _regenerator2["default"])().w(function (_context3) {
|
|
276
|
+
while (1) switch (_context3.n) {
|
|
283
277
|
case 0:
|
|
284
278
|
if (!(typeof contentsMiddleware.handle === "function")) {
|
|
285
|
-
_context3.
|
|
279
|
+
_context3.n = 2;
|
|
286
280
|
break;
|
|
287
281
|
}
|
|
288
|
-
_context3.
|
|
282
|
+
_context3.n = 1;
|
|
289
283
|
return contentsMiddleware.handle(req, res, next);
|
|
290
|
-
case
|
|
291
|
-
return _context3.
|
|
292
|
-
case
|
|
293
|
-
return _context3.
|
|
294
|
-
case 5:
|
|
295
|
-
case "end":
|
|
296
|
-
return _context3.stop();
|
|
284
|
+
case 1:
|
|
285
|
+
return _context3.a(2, _context3.v);
|
|
286
|
+
case 2:
|
|
287
|
+
return _context3.a(2, contentsMiddleware);
|
|
297
288
|
}
|
|
298
289
|
}, _callee3);
|
|
299
290
|
}));
|
|
@@ -245,11 +245,11 @@ function createWappMiddleware() {
|
|
|
245
245
|
}
|
|
246
246
|
function defaultRunSendMiddlewares(req, res, out) {
|
|
247
247
|
if (wappMiddleware.sendMiddlewares) {
|
|
248
|
-
var
|
|
248
|
+
var _next = function next() {
|
|
249
249
|
if (sendMiddlewares[index]) {
|
|
250
250
|
var func = sendMiddlewares[index];
|
|
251
251
|
index = index + 1;
|
|
252
|
-
return func(req, res,
|
|
252
|
+
return func(req, res, _next);
|
|
253
253
|
} else if (typeof out == "function") {
|
|
254
254
|
return out();
|
|
255
255
|
}
|
|
@@ -259,7 +259,7 @@ function createWappMiddleware() {
|
|
|
259
259
|
return wappMiddleware.sendMiddlewares[key];
|
|
260
260
|
});
|
|
261
261
|
var index = 0;
|
|
262
|
-
return
|
|
262
|
+
return _next();
|
|
263
263
|
} else if (typeof out == "function") {
|
|
264
264
|
return out();
|
|
265
265
|
}
|