@smartlyio/oats-axios-adapter 6.1.2 → 6.1.3
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/index.js +7 -4
- package/dist/index.js.map +1 -1
- package/index.ts +8 -2
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -61,17 +61,20 @@ function create({ axiosInstance = axios_1.default, preserveQueryArrayParamNames
|
|
|
61
61
|
return createAxiosAdapter({ axiosInstance, preserveQueryArrayParamNames });
|
|
62
62
|
}
|
|
63
63
|
exports.create = create;
|
|
64
|
+
const removeUndefined = (obj) => Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined));
|
|
64
65
|
function createAxiosAdapter({ axiosInstance, preserveQueryArrayParamNames }) {
|
|
65
66
|
return async (arg) => {
|
|
66
|
-
var _a;
|
|
67
67
|
if (arg.servers.length !== 1) {
|
|
68
68
|
return (0, assert_1.fail)('cannot decide which server to use from ' + arg.servers.join(', '));
|
|
69
69
|
}
|
|
70
70
|
const server = arg.servers[0];
|
|
71
|
-
const params = axiosToJson(arg.query);
|
|
71
|
+
const params = removeUndefined(axiosToJson(arg.query));
|
|
72
72
|
const data = toRequestData(arg.body);
|
|
73
73
|
const url = server + arg.path;
|
|
74
|
-
const headers =
|
|
74
|
+
const headers = removeUndefined({
|
|
75
|
+
...arg.headers,
|
|
76
|
+
...(data instanceof FormData ? data.getHeaders() : {})
|
|
77
|
+
});
|
|
75
78
|
const response = await axiosInstance.request({
|
|
76
79
|
method: arg.method,
|
|
77
80
|
headers,
|
|
@@ -88,7 +91,7 @@ function createAxiosAdapter({ axiosInstance, preserveQueryArrayParamNames }) {
|
|
|
88
91
|
contentType,
|
|
89
92
|
value: getResponseData(contentType, response)
|
|
90
93
|
},
|
|
91
|
-
headers:
|
|
94
|
+
headers: response.headers ?? {}
|
|
92
95
|
};
|
|
93
96
|
};
|
|
94
97
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AACnD,sCAAsC;AACtC,yCAAoC;AACpC,iCAAkE;AAClE,uCAAwD;AAExD,SAAS,aAAa,CAAC,IAAiD;IACtE,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAI,CAAC,WAAW,KAAK,kBAAkB,EAAE;QAC3C,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAChC;IACD,IAAI,CAAC,mCAAmC,EAAE,qBAAqB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QAC/F,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,OAAO,YAAY,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE;gBAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aACnD;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IACD,IAAA,aAAI,EAAC,wCAAwC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,WAAW,CAAC,IAAS;IAC5B,IAAI,IAAI,YAAY,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE;QACjD,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KACxC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACU,QAAA,IAAI,GAAiC,kBAAkB,CAAC;IACnE,aAAa,EAAE,eAAW;IAC1B,4BAA4B,EAAE,KAAK;CACpC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,aAA4B;IACpD,OAAO,kBAAkB,CAAC,EAAE,aAAa,EAAE,4BAA4B,EAAE,KAAK,EAAE,CAAC,CAAC;AACpF,CAAC;AAFD,8BAEC;AAaD;;GAEG;AACH,SAAgB,MAAM,CAAC,EACrB,aAAa,GAAG,eAAW,EAC3B,4BAA4B,GAAG,IAAI,KACH,EAAE;IAClC,OAAO,kBAAkB,CAAC,EAAE,aAAa,EAAE,4BAA4B,EAAE,CAAC,CAAC;AAC7E,CAAC;AALD,wBAKC;AAED,SAAS,kBAAkB,CAAC,EAC1B,aAAa,EACb,4BAA4B,EACR;IACpB,OAAO,KAAK,EAAC,GAAG,EAAC,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
|
@@ -75,6 +75,9 @@ export function create({
|
|
|
75
75
|
return createAxiosAdapter({ axiosInstance, preserveQueryArrayParamNames });
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
+
const removeUndefined = <T extends object>(obj: T): T =>
|
|
79
|
+
Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined)) as any;
|
|
80
|
+
|
|
78
81
|
function createAxiosAdapter({
|
|
79
82
|
axiosInstance,
|
|
80
83
|
preserveQueryArrayParamNames
|
|
@@ -84,10 +87,13 @@ function createAxiosAdapter({
|
|
|
84
87
|
return fail('cannot decide which server to use from ' + arg.servers.join(', '));
|
|
85
88
|
}
|
|
86
89
|
const server = arg.servers[0];
|
|
87
|
-
const params = axiosToJson(arg.query);
|
|
90
|
+
const params = removeUndefined(axiosToJson(arg.query));
|
|
88
91
|
const data = toRequestData(arg.body);
|
|
89
92
|
const url = server + arg.path;
|
|
90
|
-
const headers =
|
|
93
|
+
const headers = removeUndefined({
|
|
94
|
+
...arg.headers,
|
|
95
|
+
...(data instanceof FormData ? data.getHeaders() : {})
|
|
96
|
+
});
|
|
91
97
|
const response = await axiosInstance.request({
|
|
92
98
|
method: arg.method,
|
|
93
99
|
headers,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smartlyio/oats-axios-adapter",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Axios adapter for Oats a Openapi3 based generator for typescript aware servers and clients",
|
|
6
6
|
"private": false,
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
],
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@jest/globals": "29.5.0",
|
|
38
|
-
"@smartlyio/oats-runtime": "^6.1.
|
|
38
|
+
"@smartlyio/oats-runtime": "^6.1.3",
|
|
39
39
|
"@types/form-data": "2.5.0",
|
|
40
40
|
"axios": "0.27.2",
|
|
41
41
|
"jest": "29.5.0",
|
|
42
42
|
"ts-jest": "29.0.5",
|
|
43
43
|
"typescript": "4.9.5"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "6c61e57b06b30429365c810c0ebcda9ba9114146"
|
|
46
46
|
}
|