@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,197 +1,70 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
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
|
-
};
|
|
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: []
|
|
39
|
-
};
|
|
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) {
|
|
110
|
-
op = [
|
|
111
|
-
6,
|
|
112
|
-
e
|
|
113
|
-
];
|
|
114
|
-
y = 0;
|
|
115
|
-
} finally{
|
|
116
|
-
f = t = 0;
|
|
117
|
-
}
|
|
118
|
-
if (op[0] & 5) throw op[1];
|
|
119
|
-
return {
|
|
120
|
-
value: op[0] ? op[1] : void 0,
|
|
121
|
-
done: true
|
|
122
|
-
};
|
|
123
|
-
}
|
|
124
|
-
};
|
|
125
|
-
import { compile } from "path-to-regexp";
|
|
126
|
-
import { redirect } from "react-router-dom";
|
|
127
|
-
var getRequestUrl = function(param) {
|
|
128
|
-
var params = param.params, request = param.request, routeId = param.routeId;
|
|
129
|
-
var url = new URL(request.url);
|
|
130
|
-
var toPath = compile(url.pathname, {
|
|
131
|
-
encode: encodeURIComponent
|
|
132
|
-
});
|
|
133
|
-
var newPathName = toPath(params);
|
|
134
|
-
url.pathname = newPathName;
|
|
135
|
-
url.searchParams.append("_loader", routeId);
|
|
136
|
-
return url;
|
|
1
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
3
|
+
// eslint-disable-next-line eslint-comments/disable-enable-pair
|
|
4
|
+
/* eslint-disable node/prefer-global/url */
|
|
5
|
+
// eslint-disable-next-line eslint-comments/disable-enable-pair
|
|
6
|
+
/* eslint-disable node/no-unsupported-features/node-builtins */
|
|
7
|
+
import { compile } from 'path-to-regexp';
|
|
8
|
+
import { redirect } from 'react-router-dom';
|
|
9
|
+
export var getRequestUrl = function getRequestUrl(_ref) {
|
|
10
|
+
var params = _ref.params,
|
|
11
|
+
request = _ref.request,
|
|
12
|
+
routeId = _ref.routeId;
|
|
13
|
+
var url = new URL(request.url);
|
|
14
|
+
var toPath = compile(url.pathname, {
|
|
15
|
+
encode: encodeURIComponent
|
|
16
|
+
});
|
|
17
|
+
var newPathName = toPath(params);
|
|
18
|
+
url.pathname = newPathName;
|
|
19
|
+
url.searchParams.append('_loader', routeId);
|
|
20
|
+
return url;
|
|
137
21
|
};
|
|
138
|
-
var handleRedirectResponse = function(res) {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
22
|
+
var handleRedirectResponse = function handleRedirectResponse(res) {
|
|
23
|
+
var headers = res.headers;
|
|
24
|
+
var location = headers.get('X-Modernjs-Redirect');
|
|
25
|
+
if (location) {
|
|
26
|
+
return redirect(location);
|
|
27
|
+
}
|
|
28
|
+
return res;
|
|
145
29
|
};
|
|
146
|
-
var createRequest = function(routeId) {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
2
|
|
188
|
-
];
|
|
189
|
-
}
|
|
190
|
-
});
|
|
191
|
-
});
|
|
192
|
-
return function(_) {
|
|
193
|
-
return _ref.apply(this, arguments);
|
|
194
|
-
};
|
|
195
|
-
}();
|
|
196
|
-
};
|
|
197
|
-
export { createRequest, getRequestUrl };
|
|
30
|
+
export var createRequest = function createRequest(routeId) {
|
|
31
|
+
var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'get';
|
|
32
|
+
return /*#__PURE__*/function () {
|
|
33
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
|
|
34
|
+
var params, request, url, res;
|
|
35
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
36
|
+
while (1) {
|
|
37
|
+
switch (_context.prev = _context.next) {
|
|
38
|
+
case 0:
|
|
39
|
+
params = _ref2.params, request = _ref2.request;
|
|
40
|
+
url = getRequestUrl({
|
|
41
|
+
params: params,
|
|
42
|
+
request: request,
|
|
43
|
+
routeId: routeId
|
|
44
|
+
});
|
|
45
|
+
_context.prev = 2;
|
|
46
|
+
_context.next = 5;
|
|
47
|
+
return fetch(url, {
|
|
48
|
+
method: method,
|
|
49
|
+
signal: request.signal
|
|
50
|
+
});
|
|
51
|
+
case 5:
|
|
52
|
+
res = _context.sent;
|
|
53
|
+
return _context.abrupt("return", handleRedirectResponse(res));
|
|
54
|
+
case 9:
|
|
55
|
+
_context.prev = 9;
|
|
56
|
+
_context.t0 = _context["catch"](2);
|
|
57
|
+
console.error(_context.t0);
|
|
58
|
+
throw _context.t0;
|
|
59
|
+
case 13:
|
|
60
|
+
case "end":
|
|
61
|
+
return _context.stop();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}, _callee, null, [[2, 9]]);
|
|
65
|
+
}));
|
|
66
|
+
return function (_x) {
|
|
67
|
+
return _ref3.apply(this, arguments);
|
|
68
|
+
};
|
|
69
|
+
}();
|
|
70
|
+
};
|
|
@@ -1,35 +1,18 @@
|
|
|
1
|
-
import path from
|
|
2
|
-
var generateClient = function(
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
} finally{
|
|
20
|
-
try {
|
|
21
|
-
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
22
|
-
_iterator.return();
|
|
23
|
-
}
|
|
24
|
-
} finally{
|
|
25
|
-
if (_didIteratorError) {
|
|
26
|
-
throw _iteratorError;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
exportsCode += "}";
|
|
31
|
-
var requestCreatorPath = path.join(__dirname, "./create-request").replace("node", "treeshaking").replace(/\\/g, "/");
|
|
32
|
-
var importCode = "\n import { createRequest } from '".concat(requestCreatorPath, "';\n ");
|
|
33
|
-
return "\n ".concat(importCode, "\n ").concat(requestCode, "\n ").concat(exportsCode, "\n ");
|
|
34
|
-
};
|
|
35
|
-
export { generateClient };
|
|
1
|
+
import path from 'path';
|
|
2
|
+
export var generateClient = function generateClient(_ref) {
|
|
3
|
+
var mapFile = _ref.mapFile;
|
|
4
|
+
var loadersMap = require(mapFile);
|
|
5
|
+
var requestCode = Object.keys(loadersMap).map(function (loaderId) {
|
|
6
|
+
var routeId = loadersMap[loaderId];
|
|
7
|
+
return "\n const ".concat(loaderId, " = createRequest('").concat(routeId, "');\n ");
|
|
8
|
+
}).join('');
|
|
9
|
+
var exportsCode = "export {";
|
|
10
|
+
for (var _i = 0, _Object$keys = Object.keys(loadersMap); _i < _Object$keys.length; _i++) {
|
|
11
|
+
var loader = _Object$keys[_i];
|
|
12
|
+
exportsCode += "".concat(loader, ",");
|
|
13
|
+
}
|
|
14
|
+
exportsCode += '}';
|
|
15
|
+
var requestCreatorPath = path.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
|
|
16
|
+
var importCode = "\n import { createRequest } from '".concat(requestCreatorPath, "';\n ");
|
|
17
|
+
return "\n ".concat(importCode, "\n ").concat(requestCode, "\n ").concat(exportsCode, "\n ");
|
|
18
|
+
};
|
|
@@ -1,153 +1,39 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
reject(error);
|
|
7
|
-
return;
|
|
8
|
-
}
|
|
9
|
-
if (info.done) {
|
|
10
|
-
resolve(value);
|
|
11
|
-
} else {
|
|
12
|
-
Promise.resolve(value).then(_next, _throw);
|
|
13
|
-
}
|
|
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
|
-
};
|
|
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: []
|
|
39
|
-
};
|
|
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) {
|
|
110
|
-
op = [
|
|
111
|
-
6,
|
|
112
|
-
e
|
|
113
|
-
];
|
|
114
|
-
y = 0;
|
|
115
|
-
} finally{
|
|
116
|
-
f = t = 0;
|
|
117
|
-
}
|
|
118
|
-
if (op[0] & 5) throw op[1];
|
|
119
|
-
return {
|
|
120
|
-
value: op[0] ? op[1] : void 0,
|
|
121
|
-
done: true
|
|
122
|
-
};
|
|
123
|
-
}
|
|
124
|
-
};
|
|
1
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
3
|
+
// eslint-disable-next-line eslint-comments/disable-enable-pair
|
|
4
|
+
/* eslint-disable @babel/no-invalid-this */
|
|
5
|
+
|
|
125
6
|
import { generateClient } from "./generate-client";
|
|
126
|
-
function loader(
|
|
127
|
-
|
|
7
|
+
export default function loader(_x) {
|
|
8
|
+
return _loader.apply(this, arguments);
|
|
128
9
|
}
|
|
129
10
|
function _loader() {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
11
|
+
_loader = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
|
|
12
|
+
var _this$_compiler;
|
|
13
|
+
var target, options, code;
|
|
14
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
15
|
+
while (1) {
|
|
16
|
+
switch (_context.prev = _context.next) {
|
|
17
|
+
case 0:
|
|
133
18
|
this.cacheable();
|
|
134
|
-
target = (
|
|
135
|
-
if (target ===
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
source
|
|
139
|
-
];
|
|
19
|
+
target = (_this$_compiler = this._compiler) === null || _this$_compiler === void 0 ? void 0 : _this$_compiler.options.target;
|
|
20
|
+
if (!(target === 'node')) {
|
|
21
|
+
_context.next = 4;
|
|
22
|
+
break;
|
|
140
23
|
}
|
|
24
|
+
return _context.abrupt("return", source);
|
|
25
|
+
case 4:
|
|
141
26
|
options = this.getOptions();
|
|
142
27
|
code = generateClient({
|
|
143
|
-
|
|
28
|
+
mapFile: options.mapFile
|
|
144
29
|
});
|
|
145
|
-
return
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
153
|
-
|
|
30
|
+
return _context.abrupt("return", code);
|
|
31
|
+
case 7:
|
|
32
|
+
case "end":
|
|
33
|
+
return _context.stop();
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}, _callee, this);
|
|
37
|
+
}));
|
|
38
|
+
return _loader.apply(this, arguments);
|
|
39
|
+
}
|