@modern-js/create-request 1.2.3 → 1.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { compile, pathToRegexp } from 'path-to-regexp';
|
|
2
|
+
import qs from 'query-string';
|
|
2
3
|
import { handleRes } from "./handleRes";
|
|
3
4
|
let realRequest;
|
|
4
5
|
let realAllowedHeaders;
|
|
@@ -39,7 +40,7 @@ fetch = originFetch) => {
|
|
|
39
40
|
payload.params[key.name] = args[index];
|
|
40
41
|
});
|
|
41
42
|
const finalPath = getFinalPath(payload.params);
|
|
42
|
-
const finalURL = payload.query ? `${finalPath}?${
|
|
43
|
+
const finalURL = payload.query ? `${finalPath}?${qs.stringify(payload.query)}` : finalPath;
|
|
43
44
|
const headers = payload.headers || {};
|
|
44
45
|
let body = payload.data && typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
|
|
45
46
|
|
|
@@ -61,7 +62,7 @@ fetch = originFetch) => {
|
|
|
61
62
|
// @ts-expect-error
|
|
62
63
|
// eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
|
|
63
64
|
!(payload.formUrlencoded instanceof URLSearchParams)) {
|
|
64
|
-
body =
|
|
65
|
+
body = qs.stringify(payload.formUrlencoded);
|
|
65
66
|
} else {
|
|
66
67
|
body = payload.formUrlencoded;
|
|
67
68
|
}
|
|
@@ -75,16 +76,4 @@ fetch = originFetch) => {
|
|
|
75
76
|
};
|
|
76
77
|
|
|
77
78
|
return sender;
|
|
78
|
-
};
|
|
79
|
-
|
|
80
|
-
const qsStringify = input => {
|
|
81
|
-
const tupleList = [];
|
|
82
|
-
|
|
83
|
-
for (const p in input) {
|
|
84
|
-
if (input.hasOwnProperty(p)) {
|
|
85
|
-
tupleList.push(`${encodeURIComponent(p)}=${encodeURIComponent(input[p])}`);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
return tupleList.join('&');
|
|
90
79
|
};
|
package/dist/js/modern/node.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import qs from 'querystring';
|
|
2
1
|
import nodeFetch from 'node-fetch';
|
|
3
2
|
import { compile, pathToRegexp } from 'path-to-regexp';
|
|
4
|
-
import { useHeaders } from '@modern-js/utils';
|
|
3
|
+
import { useHeaders } from '@modern-js/utils/ssr';
|
|
4
|
+
import qs from 'query-string';
|
|
5
5
|
import { handleRes } from "./handleRes";
|
|
6
6
|
let realRequest;
|
|
7
7
|
let realAllowedHeaders = [];
|
|
@@ -34,7 +34,6 @@ fetch = nodeFetch) => {
|
|
|
34
34
|
pathToRegexp(path, keys);
|
|
35
35
|
|
|
36
36
|
const sender = (...args) => {
|
|
37
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
38
37
|
const webRequestHeaders = useHeaders();
|
|
39
38
|
const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
|
|
40
39
|
payload.params = payload.params || {};
|
package/dist/js/node/browser.js
CHANGED
|
@@ -7,8 +7,12 @@ exports.createRequest = exports.configure = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _pathToRegexp = require("path-to-regexp");
|
|
9
9
|
|
|
10
|
+
var _queryString = _interopRequireDefault(require("query-string"));
|
|
11
|
+
|
|
10
12
|
var _handleRes = require("./handleRes");
|
|
11
13
|
|
|
14
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
+
|
|
12
16
|
let realRequest;
|
|
13
17
|
let realAllowedHeaders;
|
|
14
18
|
|
|
@@ -51,7 +55,7 @@ fetch = originFetch) => {
|
|
|
51
55
|
payload.params[key.name] = args[index];
|
|
52
56
|
});
|
|
53
57
|
const finalPath = getFinalPath(payload.params);
|
|
54
|
-
const finalURL = payload.query ? `${finalPath}?${
|
|
58
|
+
const finalURL = payload.query ? `${finalPath}?${_queryString.default.stringify(payload.query)}` : finalPath;
|
|
55
59
|
const headers = payload.headers || {};
|
|
56
60
|
let body = payload.data && typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
|
|
57
61
|
|
|
@@ -73,7 +77,7 @@ fetch = originFetch) => {
|
|
|
73
77
|
// @ts-expect-error
|
|
74
78
|
// eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
|
|
75
79
|
!(payload.formUrlencoded instanceof URLSearchParams)) {
|
|
76
|
-
body =
|
|
80
|
+
body = _queryString.default.stringify(payload.formUrlencoded);
|
|
77
81
|
} else {
|
|
78
82
|
body = payload.formUrlencoded;
|
|
79
83
|
}
|
|
@@ -89,16 +93,4 @@ fetch = originFetch) => {
|
|
|
89
93
|
return sender;
|
|
90
94
|
};
|
|
91
95
|
|
|
92
|
-
exports.createRequest = createRequest;
|
|
93
|
-
|
|
94
|
-
const qsStringify = input => {
|
|
95
|
-
const tupleList = [];
|
|
96
|
-
|
|
97
|
-
for (const p in input) {
|
|
98
|
-
if (input.hasOwnProperty(p)) {
|
|
99
|
-
tupleList.push(`${encodeURIComponent(p)}=${encodeURIComponent(input[p])}`);
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
return tupleList.join('&');
|
|
104
|
-
};
|
|
96
|
+
exports.createRequest = createRequest;
|
package/dist/js/node/node.js
CHANGED
|
@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.createRequest = exports.configure = void 0;
|
|
7
7
|
|
|
8
|
-
var _querystring = _interopRequireDefault(require("querystring"));
|
|
9
|
-
|
|
10
8
|
var _nodeFetch = _interopRequireDefault(require("node-fetch"));
|
|
11
9
|
|
|
12
10
|
var _pathToRegexp = require("path-to-regexp");
|
|
13
11
|
|
|
14
|
-
var
|
|
12
|
+
var _ssr = require("@modern-js/utils/ssr");
|
|
13
|
+
|
|
14
|
+
var _queryString = _interopRequireDefault(require("query-string"));
|
|
15
15
|
|
|
16
16
|
var _handleRes = require("./handleRes");
|
|
17
17
|
|
|
@@ -51,15 +51,14 @@ fetch = _nodeFetch.default) => {
|
|
|
51
51
|
(0, _pathToRegexp.pathToRegexp)(path, keys);
|
|
52
52
|
|
|
53
53
|
const sender = (...args) => {
|
|
54
|
-
|
|
55
|
-
const webRequestHeaders = (0, _utils.useHeaders)();
|
|
54
|
+
const webRequestHeaders = (0, _ssr.useHeaders)();
|
|
56
55
|
const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
|
|
57
56
|
payload.params = payload.params || {};
|
|
58
57
|
keys.forEach((key, index) => {
|
|
59
58
|
payload.params[key.name] = args[index];
|
|
60
59
|
});
|
|
61
60
|
const plainPath = getFinalPath(payload.params);
|
|
62
|
-
const finalPath = payload.query ? `${plainPath}?${
|
|
61
|
+
const finalPath = payload.query ? `${plainPath}?${_queryString.default.stringify(payload.query)}` : plainPath;
|
|
63
62
|
const headers = payload.headers || {};
|
|
64
63
|
let body;
|
|
65
64
|
|
|
@@ -84,7 +83,7 @@ fetch = _nodeFetch.default) => {
|
|
|
84
83
|
headers['Content-Type'] = 'application/x-www-form-urlencoded';
|
|
85
84
|
|
|
86
85
|
if (typeof payload.formUrlencoded === 'object') {
|
|
87
|
-
body =
|
|
86
|
+
body = _queryString.default.stringify(payload.formUrlencoded);
|
|
88
87
|
} else {
|
|
89
88
|
body = payload.formUrlencoded;
|
|
90
89
|
}
|
|
@@ -7,6 +7,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
|
|
|
7
7
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
8
8
|
|
|
9
9
|
import { compile, pathToRegexp } from 'path-to-regexp';
|
|
10
|
+
import qs from 'query-string';
|
|
10
11
|
import { handleRes } from "./handleRes";
|
|
11
12
|
var realRequest;
|
|
12
13
|
var realAllowedHeaders;
|
|
@@ -66,7 +67,7 @@ export var createRequest = function createRequest(path, method, port) {
|
|
|
66
67
|
payload.params[key.name] = args[index];
|
|
67
68
|
});
|
|
68
69
|
finalPath = getFinalPath(payload.params);
|
|
69
|
-
finalURL = payload.query ? "".concat(finalPath, "?").concat(
|
|
70
|
+
finalURL = payload.query ? "".concat(finalPath, "?").concat(qs.stringify(payload.query)) : finalPath;
|
|
70
71
|
headers = payload.headers || {};
|
|
71
72
|
body = payload.data && _typeof(payload.data) === 'object' ? JSON.stringify(payload.data) : payload.body;
|
|
72
73
|
|
|
@@ -88,7 +89,7 @@ export var createRequest = function createRequest(path, method, port) {
|
|
|
88
89
|
// @ts-expect-error
|
|
89
90
|
// eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
|
|
90
91
|
!(payload.formUrlencoded instanceof URLSearchParams)) {
|
|
91
|
-
body =
|
|
92
|
+
body = qs.stringify(payload.formUrlencoded);
|
|
92
93
|
} else {
|
|
93
94
|
body = payload.formUrlencoded;
|
|
94
95
|
}
|
|
@@ -114,16 +115,4 @@ export var createRequest = function createRequest(path, method, port) {
|
|
|
114
115
|
}();
|
|
115
116
|
|
|
116
117
|
return sender;
|
|
117
|
-
};
|
|
118
|
-
|
|
119
|
-
var qsStringify = function qsStringify(input) {
|
|
120
|
-
var tupleList = [];
|
|
121
|
-
|
|
122
|
-
for (var p in input) {
|
|
123
|
-
if (input.hasOwnProperty(p)) {
|
|
124
|
-
tupleList.push("".concat(encodeURIComponent(p), "=").concat(encodeURIComponent(input[p])));
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
return tupleList.join('&');
|
|
129
118
|
};
|
|
@@ -6,10 +6,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
6
6
|
|
|
7
7
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
8
8
|
|
|
9
|
-
import qs from 'querystring';
|
|
10
9
|
import nodeFetch from 'node-fetch';
|
|
11
10
|
import { compile, pathToRegexp } from 'path-to-regexp';
|
|
12
|
-
import { useHeaders } from '@modern-js/utils';
|
|
11
|
+
import { useHeaders } from '@modern-js/utils/ssr';
|
|
12
|
+
import qs from 'query-string';
|
|
13
13
|
import { handleRes } from "./handleRes";
|
|
14
14
|
var realRequest;
|
|
15
15
|
var realAllowedHeaders = [];
|
|
@@ -45,7 +45,6 @@ export var createRequest = function createRequest(path, method, port) {
|
|
|
45
45
|
args[_key] = arguments[_key];
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
49
48
|
var webRequestHeaders = useHeaders();
|
|
50
49
|
var payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
|
|
51
50
|
payload.params = payload.params || {};
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "1.2.
|
|
14
|
+
"version": "1.2.6",
|
|
15
15
|
"jsnext:source": "./src/index.ts",
|
|
16
16
|
"types": "./dist/types/index.d.ts",
|
|
17
17
|
"main": "./dist/js/node/index.js",
|
|
@@ -63,23 +63,24 @@
|
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"@babel/runtime": "^7",
|
|
66
|
-
"@modern-js/
|
|
66
|
+
"@modern-js/plugin-ssr": "^1.3.0",
|
|
67
|
+
"@modern-js/utils": "^1.7.0",
|
|
67
68
|
"node-fetch": "^2.6.1",
|
|
68
69
|
"path-to-regexp": "^6.2.0",
|
|
69
|
-
"
|
|
70
|
+
"query-string": "^7.1.1"
|
|
70
71
|
},
|
|
71
72
|
"devDependencies": {
|
|
72
73
|
"@scripts/build": "0.0.0",
|
|
74
|
+
"@scripts/jest-config": "0.0.0",
|
|
73
75
|
"@types/jest": "^27.0.3",
|
|
74
76
|
"@types/node": "^14",
|
|
75
|
-
"@types/node-fetch": "^2.
|
|
77
|
+
"@types/node-fetch": "^2.6.1",
|
|
76
78
|
"@types/react": "^17",
|
|
77
79
|
"@types/react-dom": "^17",
|
|
78
80
|
"isomorphic-fetch": "^3.0.0",
|
|
79
|
-
"nock": "^13.2.1",
|
|
80
|
-
"typescript": "^4",
|
|
81
81
|
"jest": "^27",
|
|
82
|
-
"
|
|
82
|
+
"nock": "^13.2.1",
|
|
83
|
+
"typescript": "^4"
|
|
83
84
|
},
|
|
84
85
|
"sideEffects": false,
|
|
85
86
|
"publishConfig": {
|