@sebspark/openapi-client 1.4.0 → 1.4.2

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.
Files changed (3) hide show
  1. package/dist/index.js +44 -30
  2. package/dist/index.mjs +44 -30
  3. package/package.json +6 -4
package/dist/index.js CHANGED
@@ -43,40 +43,52 @@ var import_axios = __toESM(require("axios"));
43
43
  // src/paramsSerializer.ts
44
44
  var encodeParam = (param) => encodeURIComponent(param);
45
45
  var encodeValue = (param, encodeCommas = false) => {
46
- if (encodeCommas) {
47
- return encodeURIComponent(param);
46
+ if (typeof param === "number" || typeof param === "string") {
47
+ if (encodeCommas) {
48
+ return encodeURIComponent(param);
49
+ }
50
+ return param.toString().split(",").map((p) => encodeURIComponent(p)).join(",");
48
51
  }
49
- return param.split(",").map((p) => encodeURIComponent(p)).join(",");
52
+ return "";
50
53
  };
51
- var paramsSerializer = (format) => (
52
- // biome-ignore lint/suspicious/noExplicitAny: <explanation>
53
- (params) => {
54
- if (!params) {
55
- return "";
54
+ var paramsSerializer = (format) => (params) => {
55
+ if (!params) {
56
+ return "";
57
+ }
58
+ const s = [];
59
+ for (const [key, value] of Object.entries(params)) {
60
+ if (value === void 0) {
61
+ continue;
56
62
  }
57
- return Object.entries(params).filter(([, value]) => value !== void 0).flatMap(([key, value]) => {
58
- if (Array.isArray(value)) {
59
- if (format === "comma") {
60
- return `${encodeParam(key)}=${value.map((v) => encodeValue(v, true)).join(",")}`;
61
- }
62
- return value.map((arrayValue, ix) => {
63
- switch (format) {
64
- case "indices": {
65
- return `${encodeParam(key)}[${ix}]=${encodeValue(arrayValue)}`;
66
- }
67
- case "repeat": {
68
- return `${encodeParam(key)}=${encodeValue(arrayValue)}`;
69
- }
70
- default: {
71
- return `${encodeParam(key)}[]=${encodeValue(arrayValue)}`;
72
- }
73
- }
74
- });
63
+ if (Array.isArray(value)) {
64
+ const title = encodeParam(key);
65
+ if (format === "comma") {
66
+ s.push(`${title}=${value.map((v) => encodeValue(v, true)).join(",")}`);
67
+ continue;
75
68
  }
76
- return `${encodeParam(key)}=${encodeValue(value)}`;
77
- }).join("&");
69
+ value.forEach((v, ix) => {
70
+ const value2 = encodeValue(v);
71
+ switch (format) {
72
+ case "indices": {
73
+ s.push(`${title}[${ix}]=${value2}`);
74
+ break;
75
+ }
76
+ case "repeat": {
77
+ s.push(`${title}=${value2}`);
78
+ break;
79
+ }
80
+ default: {
81
+ s.push(`${title}[]=${value2}`);
82
+ break;
83
+ }
84
+ }
85
+ });
86
+ } else {
87
+ s.push(`${encodeParam(key)}=${encodeValue(value)}`);
88
+ }
78
89
  }
79
- );
90
+ return s.join("&");
91
+ };
80
92
 
81
93
  // src/client.ts
82
94
  var TypedClient = (baseURL, globalOptions) => {
@@ -90,8 +102,10 @@ var TypedClient = (baseURL, globalOptions) => {
90
102
  return client;
91
103
  };
92
104
  var callServer = async (args) => {
105
+ var _a, _b;
93
106
  try {
94
107
  const serializer = paramsSerializer(args.arrayFormat);
108
+ const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
95
109
  const { headers, data } = await (0, import_retry.retry)(
96
110
  () => import_axios.default.request({
97
111
  baseURL: args.baseUrl,
@@ -100,7 +114,7 @@ var callServer = async (args) => {
100
114
  headers: args.headers,
101
115
  params: args.params,
102
116
  paramsSerializer: serializer,
103
- data: args.body
117
+ data: body
104
118
  }),
105
119
  args.retry
106
120
  );
package/dist/index.mjs CHANGED
@@ -8,40 +8,52 @@ import axios from "axios";
8
8
  // src/paramsSerializer.ts
9
9
  var encodeParam = (param) => encodeURIComponent(param);
10
10
  var encodeValue = (param, encodeCommas = false) => {
11
- if (encodeCommas) {
12
- return encodeURIComponent(param);
11
+ if (typeof param === "number" || typeof param === "string") {
12
+ if (encodeCommas) {
13
+ return encodeURIComponent(param);
14
+ }
15
+ return param.toString().split(",").map((p) => encodeURIComponent(p)).join(",");
13
16
  }
14
- return param.split(",").map((p) => encodeURIComponent(p)).join(",");
17
+ return "";
15
18
  };
16
- var paramsSerializer = (format) => (
17
- // biome-ignore lint/suspicious/noExplicitAny: <explanation>
18
- (params) => {
19
- if (!params) {
20
- return "";
19
+ var paramsSerializer = (format) => (params) => {
20
+ if (!params) {
21
+ return "";
22
+ }
23
+ const s = [];
24
+ for (const [key, value] of Object.entries(params)) {
25
+ if (value === void 0) {
26
+ continue;
21
27
  }
22
- return Object.entries(params).filter(([, value]) => value !== void 0).flatMap(([key, value]) => {
23
- if (Array.isArray(value)) {
24
- if (format === "comma") {
25
- return `${encodeParam(key)}=${value.map((v) => encodeValue(v, true)).join(",")}`;
26
- }
27
- return value.map((arrayValue, ix) => {
28
- switch (format) {
29
- case "indices": {
30
- return `${encodeParam(key)}[${ix}]=${encodeValue(arrayValue)}`;
31
- }
32
- case "repeat": {
33
- return `${encodeParam(key)}=${encodeValue(arrayValue)}`;
34
- }
35
- default: {
36
- return `${encodeParam(key)}[]=${encodeValue(arrayValue)}`;
37
- }
38
- }
39
- });
28
+ if (Array.isArray(value)) {
29
+ const title = encodeParam(key);
30
+ if (format === "comma") {
31
+ s.push(`${title}=${value.map((v) => encodeValue(v, true)).join(",")}`);
32
+ continue;
40
33
  }
41
- return `${encodeParam(key)}=${encodeValue(value)}`;
42
- }).join("&");
34
+ value.forEach((v, ix) => {
35
+ const value2 = encodeValue(v);
36
+ switch (format) {
37
+ case "indices": {
38
+ s.push(`${title}[${ix}]=${value2}`);
39
+ break;
40
+ }
41
+ case "repeat": {
42
+ s.push(`${title}=${value2}`);
43
+ break;
44
+ }
45
+ default: {
46
+ s.push(`${title}[]=${value2}`);
47
+ break;
48
+ }
49
+ }
50
+ });
51
+ } else {
52
+ s.push(`${encodeParam(key)}=${encodeValue(value)}`);
53
+ }
43
54
  }
44
- );
55
+ return s.join("&");
56
+ };
45
57
 
46
58
  // src/client.ts
47
59
  var TypedClient = (baseURL, globalOptions) => {
@@ -55,8 +67,10 @@ var TypedClient = (baseURL, globalOptions) => {
55
67
  return client;
56
68
  };
57
69
  var callServer = async (args) => {
70
+ var _a, _b;
58
71
  try {
59
72
  const serializer = paramsSerializer(args.arrayFormat);
73
+ const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
60
74
  const { headers, data } = await retry(
61
75
  () => axios.request({
62
76
  baseURL: args.baseUrl,
@@ -65,7 +79,7 @@ var callServer = async (args) => {
65
79
  headers: args.headers,
66
80
  params: args.params,
67
81
  paramsSerializer: serializer,
68
- data: args.body
82
+ data: body
69
83
  }),
70
84
  args.retry
71
85
  );
package/package.json CHANGED
@@ -1,17 +1,19 @@
1
1
  {
2
2
  "name": "@sebspark/openapi-client",
3
- "version": "1.4.0",
3
+ "version": "1.4.2",
4
4
  "license": "Apache-2.0",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.mjs",
7
7
  "types": "dist/index.d.ts",
8
- "files": ["dist"],
8
+ "files": [
9
+ "dist"
10
+ ],
9
11
  "scripts": {
10
12
  "generate": "yarn openapi-typegen -i ./src/test/ -o ./src/test/",
11
13
  "build": "tsup-node src/index.ts --format esm,cjs --dts",
12
14
  "dev": "tsc --watch --noEmit",
13
15
  "lint": "biome check .",
14
- "test": "vitest --passWithNoTests --coverage",
16
+ "test": "vitest run --passWithNoTests --coverage",
15
17
  "pretest": "yarn generate",
16
18
  "typecheck": "vitest --typecheck.only --passWithNoTests"
17
19
  },
@@ -22,6 +24,6 @@
22
24
  "dependencies": {
23
25
  "@sebspark/openapi-core": "*",
24
26
  "@sebspark/retry": "*",
25
- "axios": "1.6.8"
27
+ "axios": "1.7.2"
26
28
  }
27
29
  }