oazapfts 4.9.0 → 4.10.0

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.
@@ -22,7 +22,7 @@ export type WithHeaders<T extends ApiResponse> = T & {
22
22
  headers: Headers;
23
23
  };
24
24
  type MultipartRequestOpts = RequestOpts & {
25
- body?: Record<string, string | Blob | undefined | any>;
25
+ body?: Record<string, unknown>;
26
26
  };
27
27
  export declare function runtime(defaults: RequestOpts): {
28
28
  ok: typeof ok;
@@ -74,11 +74,10 @@ export declare function runtime(defaults: RequestOpts): {
74
74
  signal?: AbortSignal | null | undefined;
75
75
  window?: null | undefined;
76
76
  };
77
- multipart({ body, ...req }: MultipartRequestOpts): {
77
+ multipart({ body, headers, ...req }: MultipartRequestOpts): {
78
78
  baseUrl?: string | undefined;
79
79
  fetch?: typeof fetch | undefined;
80
80
  formDataConstructor?: (new () => FormData) | undefined;
81
- headers?: Record<string, string | number | boolean | undefined> | undefined;
82
81
  cache?: RequestCache | undefined;
83
82
  credentials?: RequestCredentials | undefined;
84
83
  integrity?: string | undefined;
@@ -92,10 +91,12 @@ export declare function runtime(defaults: RequestOpts): {
92
91
  window?: null | undefined;
93
92
  } | {
94
93
  body: FormData;
94
+ headers: {
95
+ "Content-Type": string;
96
+ };
95
97
  baseUrl?: string | undefined;
96
98
  fetch?: typeof fetch | undefined;
97
99
  formDataConstructor?: (new () => FormData) | undefined;
98
- headers?: Record<string, string | number | boolean | undefined> | undefined;
99
100
  cache?: RequestCache | undefined;
100
101
  credentials?: RequestCredentials | undefined;
101
102
  integrity?: string | undefined;
@@ -109,6 +109,11 @@ function runtime(defaults) {
109
109
  ? contentTypeHeader
110
110
  : "application/x-www-form-urlencoded";
111
111
  }
112
+ function ensureMultipartContentType(contentTypeHeader) {
113
+ return (contentTypeHeader === null || contentTypeHeader === void 0 ? void 0 : contentTypeHeader.startsWith("multipart/form-data"))
114
+ ? contentTypeHeader
115
+ : "multipart/form-data";
116
+ }
112
117
  return {
113
118
  ok: __1.ok,
114
119
  fetchText,
@@ -123,16 +128,29 @@ function runtime(defaults) {
123
128
  return Object.assign(Object.assign(Object.assign({}, req), (body != null && { body: qs.form(body) })), { headers: Object.assign(Object.assign({}, headers), { "Content-Type": ensureFormContentType(String(headers === null || headers === void 0 ? void 0 : headers["Content-Type"])) }) });
124
129
  },
125
130
  multipart(_a) {
126
- var { body } = _a, req = __rest(_a, ["body"]);
131
+ var { body, headers } = _a, req = __rest(_a, ["body", "headers"]);
127
132
  if (body == null)
128
133
  return req;
129
134
  const data = new (defaults.formDataConstructor ||
130
135
  req.formDataConstructor ||
131
136
  FormData)();
137
+ const append = (name, value) => {
138
+ if (typeof value === "string" || value instanceof Blob) {
139
+ data.append(name, value);
140
+ }
141
+ else {
142
+ data.append(name, new Blob([JSON.stringify(value)], { type: "application/json" }));
143
+ }
144
+ };
132
145
  Object.entries(body).forEach(([name, value]) => {
133
- data.append(name, value);
146
+ if (Array.isArray(value)) {
147
+ value.forEach((v) => append(name, v));
148
+ }
149
+ else {
150
+ append(name, value);
151
+ }
134
152
  });
135
- return Object.assign(Object.assign({}, req), { body: data });
153
+ return Object.assign(Object.assign({}, req), { body: data, headers: Object.assign(Object.assign({}, headers), { "Content-Type": ensureMultipartContentType(String(headers === null || headers === void 0 ? void 0 : headers["Content-Type"])) }) });
136
154
  },
137
155
  };
138
156
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oazapfts",
3
- "version": "4.9.0",
3
+ "version": "4.10.0",
4
4
  "description": "OpenApi TypeScript client generator",
5
5
  "main": "lib/index.js",
6
6
  "bin": {
@@ -43,7 +43,6 @@
43
43
  "@types/lodash": "^4.14.199",
44
44
  "@types/minimist": "^1.2.2",
45
45
  "@types/node": "^20.6.5",
46
- "form-data": "^4.0.0",
47
46
  "husky": "^8.0.3",
48
47
  "jest": "^29.7.0",
49
48
  "lint-staged": "^14.0.1",
@@ -26,7 +26,7 @@ export type ApiResponse = { status: number; data?: any };
26
26
  export type WithHeaders<T extends ApiResponse> = T & { headers: Headers };
27
27
 
28
28
  type MultipartRequestOpts = RequestOpts & {
29
- body?: Record<string, string | Blob | undefined | any>;
29
+ body?: Record<string, unknown>;
30
30
  };
31
31
 
32
32
  export function runtime(defaults: RequestOpts) {
@@ -114,6 +114,12 @@ export function runtime(defaults: RequestOpts) {
114
114
  : "application/x-www-form-urlencoded";
115
115
  }
116
116
 
117
+ function ensureMultipartContentType(contentTypeHeader: string) {
118
+ return contentTypeHeader?.startsWith("multipart/form-data")
119
+ ? contentTypeHeader
120
+ : "multipart/form-data";
121
+ }
122
+
117
123
  return {
118
124
  ok,
119
125
  fetchText,
@@ -146,17 +152,40 @@ export function runtime(defaults: RequestOpts) {
146
152
  };
147
153
  },
148
154
 
149
- multipart({ body, ...req }: MultipartRequestOpts) {
155
+ multipart({ body, headers, ...req }: MultipartRequestOpts) {
150
156
  if (body == null) return req;
151
157
  const data = new (defaults.formDataConstructor ||
152
158
  req.formDataConstructor ||
153
159
  FormData)();
160
+
161
+ const append = (name: string, value: unknown) => {
162
+ if (typeof value === "string" || value instanceof Blob) {
163
+ data.append(name, value);
164
+ } else {
165
+ data.append(
166
+ name,
167
+ new Blob([JSON.stringify(value)], { type: "application/json" }),
168
+ );
169
+ }
170
+ };
171
+
154
172
  Object.entries(body).forEach(([name, value]) => {
155
- data.append(name, value);
173
+ if (Array.isArray(value)) {
174
+ value.forEach((v) => append(name, v));
175
+ } else {
176
+ append(name, value);
177
+ }
156
178
  });
179
+
157
180
  return {
158
181
  ...req,
159
182
  body: data,
183
+ headers: {
184
+ ...headers,
185
+ "Content-Type": ensureMultipartContentType(
186
+ String(headers?.["Content-Type"]),
187
+ ),
188
+ },
160
189
  };
161
190
  },
162
191
  };