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