@modern-js/plugin-data-loader 0.0.0-next-20221209071922 → 0.0.0-next-20221209080421
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/CHANGELOG.md +31 -24
- package/dist/js/modern/cli/create-request.js +24 -38
- package/dist/js/modern/cli/generate-client.js +9 -10
- package/dist/js/modern/cli/loader.js +15 -37
- package/dist/js/modern/server/index.js +62 -101
- package/dist/js/node/cli/create-request.js +32 -56
- package/dist/js/node/cli/generate-client.js +15 -33
- package/dist/js/node/cli/loader.js +21 -56
- package/dist/js/node/server/index.js +74 -129
- package/dist/js/treeshaking/cli/create-request.js +68 -195
- package/dist/js/treeshaking/cli/generate-client.js +18 -35
- package/dist/js/treeshaking/cli/loader.js +31 -145
- package/dist/js/treeshaking/server/index.js +294 -554
- package/dist/types/server/index.d.ts +1 -3
- package/package.json +10 -10
|
@@ -1,576 +1,316 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
|
|
2
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
3
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
4
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
5
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
6
|
+
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
|
7
|
+
import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from '@remix-run/node';
|
|
8
|
+
import { matchRoutes } from 'react-router-dom';
|
|
9
|
+
import { LOADER_ROUTES_DIR } from '@modern-js/utils';
|
|
10
|
+
// Polyfill Web Fetch API
|
|
11
|
+
installGlobals();
|
|
12
|
+
var LOADER_SEARCH_PARAM = '_loader';
|
|
13
|
+
var redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
|
|
14
|
+
export function isRedirectResponse(response) {
|
|
15
|
+
return redirectStatusCodes.has(response.status);
|
|
8
16
|
}
|
|
9
|
-
function
|
|
10
|
-
|
|
11
|
-
var info = gen[key](arg);
|
|
12
|
-
var value = info.value;
|
|
13
|
-
} catch (error) {
|
|
14
|
-
reject(error);
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
if (info.done) {
|
|
18
|
-
resolve(value);
|
|
19
|
-
} else {
|
|
20
|
-
Promise.resolve(value).then(_next, _throw);
|
|
21
|
-
}
|
|
17
|
+
export function isResponse(value) {
|
|
18
|
+
return value != null && typeof value.status === 'number' && typeof value.statusText === 'string' && _typeof(value.headers) === 'object' && typeof value.body !== 'undefined';
|
|
22
19
|
}
|
|
23
|
-
function
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
20
|
+
var json = function json(data) {
|
|
21
|
+
var init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
22
|
+
var responseInit = typeof init === 'number' ? {
|
|
23
|
+
status: init
|
|
24
|
+
} : init;
|
|
25
|
+
var headers = new Headers(responseInit.headers);
|
|
26
|
+
if (!headers.has('Content-Type')) {
|
|
27
|
+
headers.set('Content-Type', 'application/json; charset=utf-8');
|
|
28
|
+
}
|
|
29
|
+
return new NodeResponse(JSON.stringify(data), _objectSpread(_objectSpread({}, responseInit), {}, {
|
|
30
|
+
headers: headers
|
|
31
|
+
}));
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
// TODO: 添加 context
|
|
35
|
+
var callRouteLoader = /*#__PURE__*/function () {
|
|
36
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
37
|
+
var routeId, loader, params, request, loadContext, result;
|
|
38
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
39
|
+
while (1) {
|
|
40
|
+
switch (_context.prev = _context.next) {
|
|
41
|
+
case 0:
|
|
42
|
+
routeId = _ref.routeId, loader = _ref.loader, params = _ref.params, request = _ref.request, loadContext = _ref.loadContext;
|
|
43
|
+
if (loader) {
|
|
44
|
+
_context.next = 3;
|
|
45
|
+
break;
|
|
30
46
|
}
|
|
31
|
-
|
|
32
|
-
|
|
47
|
+
throw new Error("You made a ".concat(request.method, " request to ").concat(request.url, " but did not provide ") + "a default component or `loader` for route \"".concat(routeId, "\", ") + "so there is no way to handle the request.");
|
|
48
|
+
case 3:
|
|
49
|
+
_context.prev = 3;
|
|
50
|
+
_context.next = 6;
|
|
51
|
+
return loader({
|
|
52
|
+
request: request,
|
|
53
|
+
params: params
|
|
54
|
+
});
|
|
55
|
+
case 6:
|
|
56
|
+
result = _context.sent;
|
|
57
|
+
_context.next = 14;
|
|
58
|
+
break;
|
|
59
|
+
case 9:
|
|
60
|
+
_context.prev = 9;
|
|
61
|
+
_context.t0 = _context["catch"](3);
|
|
62
|
+
if (isResponse(_context.t0)) {
|
|
63
|
+
_context.next = 13;
|
|
64
|
+
break;
|
|
33
65
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
return obj;
|
|
50
|
-
}
|
|
51
|
-
function _iterableToArrayLimit(arr, i) {
|
|
52
|
-
var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
|
|
53
|
-
if (_i == null) return;
|
|
54
|
-
var _arr = [];
|
|
55
|
-
var _n = true;
|
|
56
|
-
var _d = false;
|
|
57
|
-
var _s, _e;
|
|
58
|
-
try {
|
|
59
|
-
for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
|
|
60
|
-
_arr.push(_s.value);
|
|
61
|
-
if (i && _arr.length === i) break;
|
|
66
|
+
throw _context.t0;
|
|
67
|
+
case 13:
|
|
68
|
+
result = _context.t0;
|
|
69
|
+
case 14:
|
|
70
|
+
if (!(result === undefined)) {
|
|
71
|
+
_context.next = 16;
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
throw new Error("You defined a loader for route \"".concat(routeId, "\" but didn't return ") + "anything from your `loader` function. Please return a value or `null`.");
|
|
75
|
+
case 16:
|
|
76
|
+
return _context.abrupt("return", isResponse(result) ? result : json(result));
|
|
77
|
+
case 17:
|
|
78
|
+
case "end":
|
|
79
|
+
return _context.stop();
|
|
62
80
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
81
|
+
}
|
|
82
|
+
}, _callee, null, [[3, 9]]);
|
|
83
|
+
}));
|
|
84
|
+
return function callRouteLoader(_x) {
|
|
85
|
+
return _ref2.apply(this, arguments);
|
|
86
|
+
};
|
|
87
|
+
}();
|
|
88
|
+
var createLoaderHeaders = function createLoaderHeaders(requestHeaders) {
|
|
89
|
+
var headers = new Headers();
|
|
90
|
+
for (var _i = 0, _Object$entries = Object.entries(requestHeaders); _i < _Object$entries.length; _i++) {
|
|
91
|
+
var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
|
|
92
|
+
_key = _Object$entries$_i[0],
|
|
93
|
+
values = _Object$entries$_i[1];
|
|
94
|
+
if (values) {
|
|
95
|
+
if (Array.isArray(values)) {
|
|
96
|
+
var _iterator = _createForOfIteratorHelper(values),
|
|
97
|
+
_step;
|
|
67
98
|
try {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
99
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
100
|
+
var value = _step.value;
|
|
101
|
+
headers.append(_key, value);
|
|
102
|
+
}
|
|
103
|
+
} catch (err) {
|
|
104
|
+
_iterator.e(err);
|
|
105
|
+
} finally {
|
|
106
|
+
_iterator.f();
|
|
71
107
|
}
|
|
108
|
+
} else {
|
|
109
|
+
headers.set(_key, values);
|
|
110
|
+
}
|
|
72
111
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
ownKeys(Object(source)).forEach(function(key) {
|
|
112
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
return target;
|
|
116
|
-
}
|
|
117
|
-
function _slicedToArray(arr, i) {
|
|
118
|
-
return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
|
|
119
|
-
}
|
|
120
|
-
function _unsupportedIterableToArray(o, minLen) {
|
|
121
|
-
if (!o) return;
|
|
122
|
-
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
|
|
123
|
-
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
124
|
-
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
125
|
-
if (n === "Map" || n === "Set") return Array.from(n);
|
|
126
|
-
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
|
|
127
|
-
}
|
|
128
|
-
var __generator = this && this.__generator || function(thisArg, body) {
|
|
129
|
-
var f, y, t, g, _ = {
|
|
130
|
-
label: 0,
|
|
131
|
-
sent: function() {
|
|
132
|
-
if (t[0] & 1) throw t[1];
|
|
133
|
-
return t[1];
|
|
134
|
-
},
|
|
135
|
-
trys: [],
|
|
136
|
-
ops: []
|
|
137
|
-
};
|
|
138
|
-
return(g = {
|
|
139
|
-
next: verb(0),
|
|
140
|
-
"throw": verb(1),
|
|
141
|
-
"return": verb(2)
|
|
142
|
-
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
143
|
-
return this;
|
|
144
|
-
}), g);
|
|
145
|
-
function verb(n) {
|
|
146
|
-
return function(v) {
|
|
147
|
-
return step([
|
|
148
|
-
n,
|
|
149
|
-
v
|
|
150
|
-
]);
|
|
151
|
-
};
|
|
152
|
-
}
|
|
153
|
-
function step(op) {
|
|
154
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
155
|
-
while(_)try {
|
|
156
|
-
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;
|
|
157
|
-
if (y = 0, t) op = [
|
|
158
|
-
op[0] & 2,
|
|
159
|
-
t.value
|
|
160
|
-
];
|
|
161
|
-
switch(op[0]){
|
|
162
|
-
case 0:
|
|
163
|
-
case 1:
|
|
164
|
-
t = op;
|
|
165
|
-
break;
|
|
166
|
-
case 4:
|
|
167
|
-
_.label++;
|
|
168
|
-
return {
|
|
169
|
-
value: op[1],
|
|
170
|
-
done: false
|
|
171
|
-
};
|
|
172
|
-
case 5:
|
|
173
|
-
_.label++;
|
|
174
|
-
y = op[1];
|
|
175
|
-
op = [
|
|
176
|
-
0
|
|
177
|
-
];
|
|
178
|
-
continue;
|
|
179
|
-
case 7:
|
|
180
|
-
op = _.ops.pop();
|
|
181
|
-
_.trys.pop();
|
|
182
|
-
continue;
|
|
183
|
-
default:
|
|
184
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
185
|
-
_ = 0;
|
|
186
|
-
continue;
|
|
187
|
-
}
|
|
188
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
189
|
-
_.label = op[1];
|
|
190
|
-
break;
|
|
191
|
-
}
|
|
192
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
193
|
-
_.label = t[1];
|
|
194
|
-
t = op;
|
|
195
|
-
break;
|
|
196
|
-
}
|
|
197
|
-
if (t && _.label < t[2]) {
|
|
198
|
-
_.label = t[2];
|
|
199
|
-
_.ops.push(op);
|
|
200
|
-
break;
|
|
201
|
-
}
|
|
202
|
-
if (t[2]) _.ops.pop();
|
|
203
|
-
_.trys.pop();
|
|
204
|
-
continue;
|
|
112
|
+
}
|
|
113
|
+
return headers;
|
|
114
|
+
};
|
|
115
|
+
var createLoaderRequest = function createLoaderRequest(context) {
|
|
116
|
+
var origin = "".concat(context.protocol, "://").concat(context.host);
|
|
117
|
+
// eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
|
|
118
|
+
var url = new URL(context.url, origin);
|
|
119
|
+
var controller = new AbortController();
|
|
120
|
+
var init = {
|
|
121
|
+
method: context.method,
|
|
122
|
+
headers: createLoaderHeaders(context.headers),
|
|
123
|
+
signal: controller.signal
|
|
124
|
+
};
|
|
125
|
+
return new Request(url.href, init);
|
|
126
|
+
};
|
|
127
|
+
var sendLoaderResponse = /*#__PURE__*/function () {
|
|
128
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(res, nodeResponse) {
|
|
129
|
+
var _iterator2, _step2, _step2$value, _key2, value;
|
|
130
|
+
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
131
|
+
while (1) {
|
|
132
|
+
switch (_context2.prev = _context2.next) {
|
|
133
|
+
case 0:
|
|
134
|
+
res.statusMessage = nodeResponse.statusText;
|
|
135
|
+
res.statusCode = nodeResponse.status;
|
|
136
|
+
_iterator2 = _createForOfIteratorHelper(nodeResponse.headers.entries());
|
|
137
|
+
try {
|
|
138
|
+
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
139
|
+
_step2$value = _slicedToArray(_step2.value, 2), _key2 = _step2$value[0], value = _step2$value[1];
|
|
140
|
+
res.setHeader(_key2, value);
|
|
141
|
+
}
|
|
142
|
+
} catch (err) {
|
|
143
|
+
_iterator2.e(err);
|
|
144
|
+
} finally {
|
|
145
|
+
_iterator2.f();
|
|
146
|
+
}
|
|
147
|
+
if (!nodeResponse.body) {
|
|
148
|
+
_context2.next = 9;
|
|
149
|
+
break;
|
|
205
150
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
151
|
+
_context2.next = 7;
|
|
152
|
+
return writeReadableStreamToWritable(nodeResponse.body, res);
|
|
153
|
+
case 7:
|
|
154
|
+
_context2.next = 10;
|
|
155
|
+
break;
|
|
156
|
+
case 9:
|
|
157
|
+
res.end();
|
|
158
|
+
case 10:
|
|
159
|
+
case "end":
|
|
160
|
+
return _context2.stop();
|
|
215
161
|
}
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
162
|
+
}
|
|
163
|
+
}, _callee2);
|
|
164
|
+
}));
|
|
165
|
+
return function sendLoaderResponse(_x2, _x3) {
|
|
166
|
+
return _ref3.apply(this, arguments);
|
|
167
|
+
};
|
|
168
|
+
}();
|
|
169
|
+
export var getPathWithoutEntry = function getPathWithoutEntry(pathname, entryPath) {
|
|
170
|
+
if (entryPath === '/') {
|
|
171
|
+
return pathname;
|
|
172
|
+
}
|
|
173
|
+
return pathname.replace(entryPath, '');
|
|
222
174
|
};
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
var LOADER_SEARCH_PARAM = "_loader";
|
|
228
|
-
var redirectStatusCodes = /* @__PURE__ */ new Set([
|
|
229
|
-
301,
|
|
230
|
-
302,
|
|
231
|
-
303,
|
|
232
|
-
307,
|
|
233
|
-
308
|
|
234
|
-
]);
|
|
235
|
-
function isRedirectResponse(response) {
|
|
236
|
-
return redirectStatusCodes.has(response.status);
|
|
237
|
-
}
|
|
238
|
-
function isResponse(value) {
|
|
239
|
-
return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
|
|
240
|
-
}
|
|
241
|
-
var json = function(data) {
|
|
242
|
-
var init = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
|
|
243
|
-
var responseInit = typeof init === "number" ? {
|
|
244
|
-
status: init
|
|
245
|
-
} : init;
|
|
246
|
-
var headers = new Headers(responseInit.headers);
|
|
247
|
-
if (!headers.has("Content-Type")) {
|
|
248
|
-
headers.set("Content-Type", "application/json; charset=utf-8");
|
|
249
|
-
}
|
|
250
|
-
return new NodeResponse(JSON.stringify(data), _objectSpreadProps(_objectSpread({}, responseInit), {
|
|
251
|
-
headers: headers
|
|
252
|
-
}));
|
|
175
|
+
var matchEntry = function matchEntry(pathname, entries) {
|
|
176
|
+
return entries.find(function (entry) {
|
|
177
|
+
return pathname.startsWith(entry.urlPath);
|
|
178
|
+
});
|
|
253
179
|
};
|
|
254
|
-
var
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
1,
|
|
268
|
-
3,
|
|
269
|
-
,
|
|
270
|
-
4
|
|
271
|
-
]);
|
|
272
|
-
return [
|
|
273
|
-
4,
|
|
274
|
-
loader({
|
|
275
|
-
request: request,
|
|
276
|
-
params: params
|
|
277
|
-
})
|
|
278
|
-
];
|
|
279
|
-
case 2:
|
|
280
|
-
result = _state.sent();
|
|
281
|
-
return [
|
|
282
|
-
3,
|
|
283
|
-
4
|
|
284
|
-
];
|
|
285
|
-
case 3:
|
|
286
|
-
error = _state.sent();
|
|
287
|
-
if (!isResponse(error)) {
|
|
288
|
-
throw error;
|
|
289
|
-
}
|
|
290
|
-
result = error;
|
|
291
|
-
return [
|
|
292
|
-
3,
|
|
293
|
-
4
|
|
294
|
-
];
|
|
295
|
-
case 4:
|
|
296
|
-
if (result === void 0) {
|
|
297
|
-
throw new Error('You defined a loader for route "'.concat(routeId, "\" but didn't return anything from your `loader` function. Please return a value or `null`."));
|
|
298
|
-
}
|
|
299
|
-
return [
|
|
300
|
-
2,
|
|
301
|
-
isResponse(result) ? result : json(result)
|
|
302
|
-
];
|
|
180
|
+
export var handleRequest = /*#__PURE__*/function () {
|
|
181
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
|
|
182
|
+
var context, serverRoutes, distDir, method, query, routeId, entry, _yield$import, routes, res, pathname, matches, match, request, response, headers, message;
|
|
183
|
+
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
184
|
+
while (1) {
|
|
185
|
+
switch (_context3.prev = _context3.next) {
|
|
186
|
+
case 0:
|
|
187
|
+
context = _ref4.context, serverRoutes = _ref4.serverRoutes, distDir = _ref4.distDir;
|
|
188
|
+
method = context.method, query = context.query;
|
|
189
|
+
routeId = query[LOADER_SEARCH_PARAM];
|
|
190
|
+
if (!(!routeId || method.toLowerCase() !== 'get')) {
|
|
191
|
+
_context3.next = 5;
|
|
192
|
+
break;
|
|
303
193
|
}
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
var createLoaderHeaders = function(requestHeaders) {
|
|
311
|
-
var headers = new Headers();
|
|
312
|
-
var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
|
|
313
|
-
try {
|
|
314
|
-
for(var _iterator = Object.entries(requestHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
|
|
315
|
-
var _value = _slicedToArray(_step.value, 2), key = _value[0], values = _value[1];
|
|
316
|
-
if (values) {
|
|
317
|
-
if (Array.isArray(values)) {
|
|
318
|
-
var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
|
|
319
|
-
try {
|
|
320
|
-
for(var _iterator1 = values[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
|
|
321
|
-
var value = _step1.value;
|
|
322
|
-
headers.append(key, value);
|
|
323
|
-
}
|
|
324
|
-
} catch (err) {
|
|
325
|
-
_didIteratorError1 = true;
|
|
326
|
-
_iteratorError1 = err;
|
|
327
|
-
} finally{
|
|
328
|
-
try {
|
|
329
|
-
if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
|
|
330
|
-
_iterator1.return();
|
|
331
|
-
}
|
|
332
|
-
} finally{
|
|
333
|
-
if (_didIteratorError1) {
|
|
334
|
-
throw _iteratorError1;
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
|
-
} else {
|
|
339
|
-
headers.set(key, values);
|
|
340
|
-
}
|
|
194
|
+
return _context3.abrupt("return");
|
|
195
|
+
case 5:
|
|
196
|
+
entry = matchEntry(context.path, serverRoutes);
|
|
197
|
+
if (entry) {
|
|
198
|
+
_context3.next = 8;
|
|
199
|
+
break;
|
|
341
200
|
}
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
201
|
+
return _context3.abrupt("return");
|
|
202
|
+
case 8:
|
|
203
|
+
_context3.next = 10;
|
|
204
|
+
return import("".concat(distDir, "/").concat(LOADER_ROUTES_DIR, "/").concat(entry.entryName));
|
|
205
|
+
case 10:
|
|
206
|
+
_yield$import = _context3.sent;
|
|
207
|
+
routes = _yield$import.routes;
|
|
208
|
+
if (routes) {
|
|
209
|
+
_context3.next = 14;
|
|
210
|
+
break;
|
|
350
211
|
}
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
212
|
+
return _context3.abrupt("return");
|
|
213
|
+
case 14:
|
|
214
|
+
res = context.res;
|
|
215
|
+
pathname = getPathWithoutEntry(context.path, entry.urlPath);
|
|
216
|
+
matches = matchRoutes(routes, pathname);
|
|
217
|
+
if (matches) {
|
|
218
|
+
_context3.next = 21;
|
|
219
|
+
break;
|
|
354
220
|
}
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
headers: createLoaderHeaders(context.headers),
|
|
366
|
-
signal: controller.signal
|
|
367
|
-
};
|
|
368
|
-
return new Request(url.href, init);
|
|
369
|
-
};
|
|
370
|
-
var sendLoaderResponse = function() {
|
|
371
|
-
var _ref = _asyncToGenerator(function(res, nodeResponse) {
|
|
372
|
-
var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, key, value;
|
|
373
|
-
return __generator(this, function(_state) {
|
|
374
|
-
switch(_state.label){
|
|
375
|
-
case 0:
|
|
376
|
-
res.statusMessage = nodeResponse.statusText;
|
|
377
|
-
res.statusCode = nodeResponse.status;
|
|
378
|
-
_iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
|
|
379
|
-
try {
|
|
380
|
-
for(_iterator = nodeResponse.headers.entries()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
|
|
381
|
-
_value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
|
|
382
|
-
res.setHeader(key, value);
|
|
383
|
-
}
|
|
384
|
-
} catch (err) {
|
|
385
|
-
_didIteratorError = true;
|
|
386
|
-
_iteratorError = err;
|
|
387
|
-
} finally{
|
|
388
|
-
try {
|
|
389
|
-
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
390
|
-
_iterator.return();
|
|
391
|
-
}
|
|
392
|
-
} finally{
|
|
393
|
-
if (_didIteratorError) {
|
|
394
|
-
throw _iteratorError;
|
|
395
|
-
}
|
|
396
|
-
}
|
|
397
|
-
}
|
|
398
|
-
if (!nodeResponse.body) return [
|
|
399
|
-
3,
|
|
400
|
-
2
|
|
401
|
-
];
|
|
402
|
-
return [
|
|
403
|
-
4,
|
|
404
|
-
writeReadableStreamToWritable(nodeResponse.body, res)
|
|
405
|
-
];
|
|
406
|
-
case 1:
|
|
407
|
-
_state.sent();
|
|
408
|
-
return [
|
|
409
|
-
3,
|
|
410
|
-
3
|
|
411
|
-
];
|
|
412
|
-
case 2:
|
|
413
|
-
res.end();
|
|
414
|
-
_state.label = 3;
|
|
415
|
-
case 3:
|
|
416
|
-
return [
|
|
417
|
-
2
|
|
418
|
-
];
|
|
221
|
+
res.statusCode = 403;
|
|
222
|
+
res.end("Route ".concat(pathname, " was not matched"));
|
|
223
|
+
return _context3.abrupt("return");
|
|
224
|
+
case 21:
|
|
225
|
+
match = matches === null || matches === void 0 ? void 0 : matches.find(function (match) {
|
|
226
|
+
return match.route.id === routeId;
|
|
227
|
+
});
|
|
228
|
+
if (match) {
|
|
229
|
+
_context3.next = 26;
|
|
230
|
+
break;
|
|
419
231
|
}
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
method = context.method, query = context.query;
|
|
445
|
-
routeId = query[LOADER_SEARCH_PARAM];
|
|
446
|
-
if (!routeId || method.toLowerCase() !== "get") {
|
|
447
|
-
return [
|
|
448
|
-
2
|
|
449
|
-
];
|
|
450
|
-
}
|
|
451
|
-
entry = matchEntry(context.path, serverRoutes);
|
|
452
|
-
if (!entry) {
|
|
453
|
-
return [
|
|
454
|
-
2
|
|
455
|
-
];
|
|
456
|
-
}
|
|
457
|
-
return [
|
|
458
|
-
4,
|
|
459
|
-
import("".concat(distDir, "/").concat(LOADER_ROUTES_DIR, "/").concat(entry.entryName))
|
|
460
|
-
];
|
|
461
|
-
case 1:
|
|
462
|
-
routes = _state.sent().routes;
|
|
463
|
-
if (!routes) {
|
|
464
|
-
return [
|
|
465
|
-
2
|
|
466
|
-
];
|
|
467
|
-
}
|
|
468
|
-
res = context.res;
|
|
469
|
-
pathname = getPathWithoutEntry(context.path, entry.urlPath);
|
|
470
|
-
matches = matchRoutes(routes, pathname);
|
|
471
|
-
if (!matches) {
|
|
472
|
-
res.statusCode = 403;
|
|
473
|
-
res.end("Route ".concat(pathname, " was not matched"));
|
|
474
|
-
return [
|
|
475
|
-
2
|
|
476
|
-
];
|
|
477
|
-
}
|
|
478
|
-
match = matches === null || matches === void 0 ? void 0 : matches.find(function(match2) {
|
|
479
|
-
return match2.route.id === routeId;
|
|
480
|
-
});
|
|
481
|
-
if (!match) {
|
|
482
|
-
res.statusCode = 403;
|
|
483
|
-
res.end("Route ".concat(routeId, " does not match URL ").concat(context.path));
|
|
484
|
-
return [
|
|
485
|
-
2
|
|
486
|
-
];
|
|
487
|
-
}
|
|
488
|
-
request = createLoaderRequest(context);
|
|
489
|
-
_state.label = 2;
|
|
490
|
-
case 2:
|
|
491
|
-
_state.trys.push([
|
|
492
|
-
2,
|
|
493
|
-
4,
|
|
494
|
-
,
|
|
495
|
-
5
|
|
496
|
-
]);
|
|
497
|
-
return [
|
|
498
|
-
4,
|
|
499
|
-
callRouteLoader({
|
|
500
|
-
loader: match.route.loader,
|
|
501
|
-
routeId: match.route.id,
|
|
502
|
-
params: match.params,
|
|
503
|
-
request: request,
|
|
504
|
-
loadContext: {}
|
|
505
|
-
})
|
|
506
|
-
];
|
|
507
|
-
case 3:
|
|
508
|
-
response = _state.sent();
|
|
509
|
-
if (isRedirectResponse(response)) {
|
|
510
|
-
headers = new Headers(response.headers);
|
|
511
|
-
headers.set("X-Modernjs-Redirect", headers.get("Location"));
|
|
512
|
-
headers.delete("Location");
|
|
513
|
-
response = new NodeResponse(null, {
|
|
514
|
-
status: 204,
|
|
515
|
-
headers: headers
|
|
516
|
-
});
|
|
517
|
-
}
|
|
518
|
-
return [
|
|
519
|
-
3,
|
|
520
|
-
5
|
|
521
|
-
];
|
|
522
|
-
case 4:
|
|
523
|
-
error = _state.sent();
|
|
524
|
-
message = String(error);
|
|
525
|
-
response = new NodeResponse(message, {
|
|
526
|
-
status: 500,
|
|
527
|
-
headers: {
|
|
528
|
-
"Content-Type": "text/plain"
|
|
529
|
-
}
|
|
530
|
-
});
|
|
531
|
-
return [
|
|
532
|
-
3,
|
|
533
|
-
5
|
|
534
|
-
];
|
|
535
|
-
case 5:
|
|
536
|
-
sendLoaderResponse(res, response);
|
|
537
|
-
return [
|
|
538
|
-
2
|
|
539
|
-
];
|
|
232
|
+
res.statusCode = 403;
|
|
233
|
+
res.end("Route ".concat(routeId, " does not match URL ").concat(context.path));
|
|
234
|
+
return _context3.abrupt("return");
|
|
235
|
+
case 26:
|
|
236
|
+
request = createLoaderRequest(context);
|
|
237
|
+
_context3.prev = 27;
|
|
238
|
+
_context3.next = 30;
|
|
239
|
+
return callRouteLoader({
|
|
240
|
+
loader: match.route.loader,
|
|
241
|
+
routeId: match.route.id,
|
|
242
|
+
params: match.params,
|
|
243
|
+
request: request,
|
|
244
|
+
loadContext: {}
|
|
245
|
+
});
|
|
246
|
+
case 30:
|
|
247
|
+
response = _context3.sent;
|
|
248
|
+
if (isRedirectResponse(response)) {
|
|
249
|
+
headers = new Headers(response.headers);
|
|
250
|
+
headers.set('X-Modernjs-Redirect', headers.get('Location'));
|
|
251
|
+
headers["delete"]('Location');
|
|
252
|
+
response = new NodeResponse(null, {
|
|
253
|
+
status: 204,
|
|
254
|
+
headers: headers
|
|
255
|
+
});
|
|
540
256
|
}
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
257
|
+
_context3.next = 38;
|
|
258
|
+
break;
|
|
259
|
+
case 34:
|
|
260
|
+
_context3.prev = 34;
|
|
261
|
+
_context3.t0 = _context3["catch"](27);
|
|
262
|
+
message = String(_context3.t0);
|
|
263
|
+
response = new NodeResponse(message, {
|
|
264
|
+
status: 500,
|
|
265
|
+
headers: {
|
|
266
|
+
'Content-Type': 'text/plain'
|
|
267
|
+
}
|
|
268
|
+
});
|
|
269
|
+
case 38:
|
|
270
|
+
sendLoaderResponse(res, response);
|
|
271
|
+
case 39:
|
|
272
|
+
case "end":
|
|
273
|
+
return _context3.stop();
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
}, _callee3, null, [[27, 34]]);
|
|
277
|
+
}));
|
|
278
|
+
return function handleRequest(_x4) {
|
|
279
|
+
return _ref5.apply(this, arguments);
|
|
280
|
+
};
|
|
546
281
|
}();
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
}();
|
|
282
|
+
export default (function () {
|
|
283
|
+
return {
|
|
284
|
+
name: '@modern-js/plugin-data-loader',
|
|
285
|
+
setup: function setup() {
|
|
286
|
+
return {
|
|
287
|
+
preparebeforeRouteHandler: function preparebeforeRouteHandler(_ref6) {
|
|
288
|
+
var serverRoutes = _ref6.serverRoutes,
|
|
289
|
+
distDir = _ref6.distDir;
|
|
290
|
+
return /*#__PURE__*/function () {
|
|
291
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(context) {
|
|
292
|
+
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
293
|
+
while (1) {
|
|
294
|
+
switch (_context4.prev = _context4.next) {
|
|
295
|
+
case 0:
|
|
296
|
+
return _context4.abrupt("return", handleRequest({
|
|
297
|
+
serverRoutes: serverRoutes,
|
|
298
|
+
distDir: distDir,
|
|
299
|
+
context: context
|
|
300
|
+
}));
|
|
301
|
+
case 1:
|
|
302
|
+
case "end":
|
|
303
|
+
return _context4.stop();
|
|
304
|
+
}
|
|
571
305
|
}
|
|
306
|
+
}, _callee4);
|
|
307
|
+
}));
|
|
308
|
+
return function (_x5) {
|
|
309
|
+
return _ref7.apply(this, arguments);
|
|
572
310
|
};
|
|
311
|
+
}();
|
|
573
312
|
}
|
|
574
|
-
|
|
575
|
-
}
|
|
576
|
-
|
|
313
|
+
};
|
|
314
|
+
}
|
|
315
|
+
};
|
|
316
|
+
});
|