apigen-ts 0.0.1 → 0.0.2

package/dist/_template.ts

@@ -28,32 +28,48 @@ export class ApiClient {
     return d
   }
 
-  async Fetch<T>(method: string, path: string, config: apigen.Req = {}): Promise<T> {
-    const fallback = globalThis.location?.origin ?? undefined
-    const url = new URL(`${this.Config.baseUrl}/${path}`.replace(/\/+/g, "/"), fallback)
-    for (const [k, v] of Object.entries(config?.search ?? {})) {
+  async ParseError(rep: Response) {
+    try {
+      // try to parse domain error from response body
+      return await rep.json()
+    } catch (e) {
+      // otherwise return response as is
+      throw rep
+    }
+  }
+
+  async Fetch<T>(method: string, path: string, opts: apigen.Req = {}): Promise<T> {
+    let base = this.Config.baseUrl
+    if (globalThis.location && (base === "" || base.startsWith("/"))) {
+      base = `${globalThis.location.origin}${base.endsWith("/") ? base : `/${base}`}`
+    }
+
+    const url = new URL(path, base)
+    for (const [k, v] of Object.entries(opts?.search ?? {})) {
       url.searchParams.append(k, Array.isArray(v) ? v.join(",") : (v as string))
     }
 
-    const headers = new Headers({ ...this.Config.headers, ...config.headers })
+    const headers = new Headers({ ...this.Config.headers, ...opts.headers })
     const ct = headers.get("content-type") ?? "application/json"
 
-    let body: FormData | string | undefined = undefined
-    if (ct === "multipart/form-data") {
+    let body: FormData | URLSearchParams | string | undefined = undefined
+
+    if (ct === "multipart/form-data" || ct === "application/x-www-form-urlencoded") {
       headers.delete("content-type") // https://stackoverflow.com/a/61053359/3664464
-      body = new FormData()
-      for (const [k, v] of Object.entries(config.body as Record<string, string>)) {
+      body = ct === "multipart/form-data" ? new FormData() : new URLSearchParams()
+      for (const [k, v] of Object.entries(opts.body as Record<string, string>)) {
         body.append(k, v)
       }
     }
 
-    if (ct === "application/json" && typeof config.body !== "string") {
+    if (ct === "application/json" && typeof opts.body !== "string") {
       headers.set("content-type", "application/json")
-      body = JSON.stringify(config.body)
+      body = JSON.stringify(opts.body)
     }
 
-    const rep = await fetch(url.toString(), { method, ...config, headers, body })
-    if (!rep.ok) throw rep
+    const credentials = opts.credentials ?? "include"
+    const rep = await fetch(url.toString(), { method, ...opts, headers, body, credentials })
+    if (!rep.ok) throw this.ParseError(rep)
 
     const rs = await rep.text()
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "apigen-ts",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "MIT",
   "author": "Vlad Pronsky <v.pronsky@gmail.com>",
   "repository": "vladkens/apigen-ts",

package/readme.md

@@ -1,21 +1,13 @@
 # OpenAPI TypeScript client generator
 
 <div align="center">
-  <a href="https://npmjs.org/package/apigen-ts">
-    <img src="https://badgen.net/npm/v/apigen-ts" alt="version" />
-  </a>
-  <a href="https://github.com/vladkens/apigen-ts/actions">
-    <img src="https://github.com/vladkens/apigen-ts/workflows/test/badge.svg" alt="test status" />
-  </a>
-  <a href="https://packagephobia.now.sh/result?p=apigen-ts">
-    <img src="https://badgen.net/packagephobia/publish/apigen-ts" alt="size" />
-  </a>
-  <a href="https://npmjs.org/package/apigen-ts">
-    <img src="https://badgen.net/npm/dm/apigen-ts" alt="downloads" />
-  </a>
-  <a href="https://github.com/vladkens/apigen-ts/blob/main/LICENSE">
-    <img src="https://badgen.net/github/license/vladkens/apigen-ts" alt="license" />
-  </a>
+
+[<img src="https://badgen.net/npm/v/apigen-ts" alt="version" />](https://npmjs.org/package/apigen-ts)
+[<img src="https://github.com/vladkens/apigen-ts/workflows/test/badge.svg" alt="test status" />](https://github.com/vladkens/apigen-ts/actions)
+[<img src="https://badgen.net/packagephobia/publish/apigen-ts" alt="size" />](https://packagephobia.now.sh/result?p=apigen-ts)
+[<img src="https://badgen.net/npm/dm/apigen-ts" alt="downloads" />](https://npmjs.org/package/apigen-ts)
+[<img src="https://badgen.net/github/license/vladkens/apigen-ts" alt="license" />](https://github.com/vladkens/apigen-ts/blob/main/LICENSE)
+
 </div>
 
 ## Features