@tidal-music/api 0.2.0 → 0.4.0

package/dist/index.js

@@ -1,180 +1,196 @@
-const B = /\{[^{}]+\}/g, F = () => {
-  var r, t;
-  return typeof process == "object" && Number.parseInt((t = (r = process == null ? void 0 : process.versions) == null ? void 0 : r.node) == null ? void 0 : t.substring(0, 2)) >= 18 && process.versions.undici;
-};
-function M() {
+const M = /\{[^{}]+\}/g, W = () => typeof process == "object" && Number.parseInt(process?.versions?.node?.substring(0, 2)) >= 18 && process.versions.undici;
+function Q() {
   return Math.random().toString(36).slice(2, 11);
 }
-function W(r) {
+function G(o) {
   let {
     baseUrl: t = "",
     Request: e = globalThis.Request,
-    fetch: i = globalThis.fetch,
-    querySerializer: n,
-    bodySerializer: o,
+    fetch: n = globalThis.fetch,
+    querySerializer: r,
+    bodySerializer: i,
     headers: l,
-    requestInitExt: f = void 0,
-    ...v
-  } = { ...r };
-  f = F() ? f : void 0, t = H(t);
-  const y = [];
-  async function h(a, s) {
+    requestInitExt: c = void 0,
+    ...B
+  } = { ...o };
+  c = W() ? c : void 0, t = P(t);
+  const p = [];
+  async function y(a, s) {
     const {
       baseUrl: m,
-      fetch: C = i,
-      Request: K = e,
-      headers: P,
+      fetch: z = n,
+      Request: V = e,
+      headers: q,
       params: w = {},
-      parseAs: S = "json",
-      querySerializer: j,
-      bodySerializer: U = o ?? G,
-      body: O,
-      ...q
+      parseAs: A = "json",
+      querySerializer: g,
+      bodySerializer: O = i ?? _,
+      body: I,
+      ...$
     } = s || {};
-    m && (t = H(m));
-    let z = typeof n == "function" ? n : I(n);
-    j && (z = typeof j == "function" ? j : I({
-      ...typeof n == "object" ? n : {},
-      ...j
+    let C = t;
+    m && (C = P(m) ?? t);
+    let v = typeof r == "function" ? r : H(r);
+    g && (v = typeof g == "function" ? g : H({
+      ...typeof r == "object" ? r : {},
+      ...g
     }));
-    const x = O === void 0 ? void 0 : U(O), L = (
+    const U = I === void 0 ? void 0 : O(
+      I,
+      // Note: we declare mergeHeaders() both here and below because it’s a bit of a chicken-or-egg situation:
+      // bodySerializer() needs all headers so we aren’t dropping ones set by the user, however,
+      // the result of this ALSO sets the lowest-priority content-type header. So we re-merge below,
+      // setting the content-type at the very beginning to be overwritten.
+      // Lastly, based on the way headers work, it’s not a simple “present-or-not” check becauase null intentionally un-sets headers.
+      D(l, q, w.header)
+    ), F = D(
       // with no body, we should not to set Content-Type
-      x === void 0 || // if serialized body is FormData; browser will correctly set Content-Type & boundary expression
-      x instanceof FormData ? {} : {
+      U === void 0 || // if serialized body is FormData; browser will correctly set Content-Type & boundary expression
+      U instanceof FormData ? {} : {
         "Content-Type": "application/json"
-      }
+      },
+      l,
+      q,
+      w.header
     ), N = {
       redirect: "follow",
-      ...v,
-      ...q,
-      body: x,
-      headers: _(L, l, P, w.header)
+      ...B,
+      ...$,
+      body: U,
+      headers: F
     };
-    let g, E, b = new e(J(a, { baseUrl: t, params: w, querySerializer: z }), N);
-    for (const u in q)
-      u in b || (b[u] = q[u]);
-    if (y.length) {
-      g = M(), E = Object.freeze({
-        baseUrl: t,
-        fetch: C,
-        parseAs: S,
-        querySerializer: z,
-        bodySerializer: U
+    let j, E, h = new e(
+      K(a, { baseUrl: C, params: w, querySerializer: v }),
+      N
+    ), f;
+    for (const d in $)
+      d in h || (h[d] = $[d]);
+    if (p.length) {
+      j = Q(), E = Object.freeze({
+        baseUrl: C,
+        fetch: z,
+        parseAs: A,
+        querySerializer: v,
+        bodySerializer: O
       });
-      for (const u of y)
-        if (u && typeof u == "object" && typeof u.onRequest == "function") {
-          const d = await u.onRequest({
-            request: b,
+      for (const d of p)
+        if (d && typeof d == "object" && typeof d.onRequest == "function") {
+          const u = await d.onRequest({
+            request: h,
             schemaPath: a,
             params: w,
             options: E,
-            id: g
+            id: j
           });
-          if (d) {
-            if (!(d instanceof e))
-              throw new Error("onRequest: must return new Request() when modifying the request");
-            b = d;
-          }
+          if (u)
+            if (u instanceof e)
+              h = u;
+            else if (u instanceof Response) {
+              f = u;
+              break;
+            } else
+              throw new Error("onRequest: must return new Request() or Response() when modifying the request");
         }
     }
-    let c;
-    try {
-      c = await C(b, f);
-    } catch (u) {
-      let d = u;
-      if (y.length)
-        for (let p = y.length - 1; p >= 0; p--) {
-          const $ = y[p];
-          if ($ && typeof $ == "object" && typeof $.onError == "function") {
-            const R = await $.onError({
-              request: b,
-              error: d,
+    if (!f) {
+      try {
+        f = await z(h, c);
+      } catch (d) {
+        let u = d;
+        if (p.length)
+          for (let b = p.length - 1; b >= 0; b--) {
+            const T = p[b];
+            if (T && typeof T == "object" && typeof T.onError == "function") {
+              const R = await T.onError({
+                request: h,
+                error: u,
+                schemaPath: a,
+                params: w,
+                options: E,
+                id: j
+              });
+              if (R) {
+                if (R instanceof Response) {
+                  u = void 0, f = R;
+                  break;
+                }
+                if (R instanceof Error) {
+                  u = R;
+                  continue;
+                }
+                throw new Error("onError: must return new Response() or instance of Error");
+              }
+            }
+          }
+        if (u)
+          throw u;
+      }
+      if (p.length)
+        for (let d = p.length - 1; d >= 0; d--) {
+          const u = p[d];
+          if (u && typeof u == "object" && typeof u.onResponse == "function") {
+            const b = await u.onResponse({
+              request: h,
+              response: f,
               schemaPath: a,
               params: w,
               options: E,
-              id: g
+              id: j
             });
-            if (R) {
-              if (R instanceof Response) {
-                d = void 0, c = R;
-                break;
-              }
-              if (R instanceof Error) {
-                d = R;
-                continue;
-              }
-              throw new Error("onError: must return new Response() or instance of Error");
+            if (b) {
+              if (!(b instanceof Response))
+                throw new Error("onResponse: must return new Response() when modifying the response");
+              f = b;
             }
           }
         }
-      if (d)
-        throw d;
     }
-    if (y.length)
-      for (let u = y.length - 1; u >= 0; u--) {
-        const d = y[u];
-        if (d && typeof d == "object" && typeof d.onResponse == "function") {
-          const p = await d.onResponse({
-            request: b,
-            response: c,
-            schemaPath: a,
-            params: w,
-            options: E,
-            id: g
-          });
-          if (p) {
-            if (!(p instanceof Response))
-              throw new Error("onResponse: must return new Response() when modifying the response");
-            c = p;
-          }
-        }
-      }
-    if (c.status === 204 || c.headers.get("Content-Length") === "0")
-      return c.ok ? { data: void 0, response: c } : { error: void 0, response: c };
-    if (c.ok)
-      return S === "stream" ? { data: c.body, response: c } : { data: await c[S](), response: c };
-    let T = await c.text();
+    if (f.status === 204 || h.method === "HEAD" || f.headers.get("Content-Length") === "0")
+      return f.ok ? { data: void 0, response: f } : { error: void 0, response: f };
+    if (f.ok)
+      return A === "stream" ? { data: f.body, response: f } : { data: await f[A](), response: f };
+    let x = await f.text();
     try {
-      T = JSON.parse(T);
+      x = JSON.parse(x);
     } catch {
     }
-    return { error: T, response: c };
+    return { error: x, response: f };
   }
   return {
     request(a, s, m) {
-      return h(s, { ...m, method: a.toUpperCase() });
+      return y(s, { ...m, method: a.toUpperCase() });
     },
     /** Call a GET endpoint */
     GET(a, s) {
-      return h(a, { ...s, method: "GET" });
+      return y(a, { ...s, method: "GET" });
     },
     /** Call a PUT endpoint */
     PUT(a, s) {
-      return h(a, { ...s, method: "PUT" });
+      return y(a, { ...s, method: "PUT" });
     },
     /** Call a POST endpoint */
     POST(a, s) {
-      return h(a, { ...s, method: "POST" });
+      return y(a, { ...s, method: "POST" });
     },
     /** Call a DELETE endpoint */
     DELETE(a, s) {
-      return h(a, { ...s, method: "DELETE" });
+      return y(a, { ...s, method: "DELETE" });
     },
     /** Call a OPTIONS endpoint */
     OPTIONS(a, s) {
-      return h(a, { ...s, method: "OPTIONS" });
+      return y(a, { ...s, method: "OPTIONS" });
     },
     /** Call a HEAD endpoint */
     HEAD(a, s) {
-      return h(a, { ...s, method: "HEAD" });
+      return y(a, { ...s, method: "HEAD" });
     },
     /** Call a PATCH endpoint */
     PATCH(a, s) {
-      return h(a, { ...s, method: "PATCH" });
+      return y(a, { ...s, method: "PATCH" });
     },
     /** Call a TRACE endpoint */
     TRACE(a, s) {
-      return h(a, { ...s, method: "TRACE" });
+      return y(a, { ...s, method: "TRACE" });
     },
     /** Register middleware */
     use(...a) {
@@ -182,180 +198,179 @@ function W(r) {
         if (s) {
           if (typeof s != "object" || !("onRequest" in s || "onResponse" in s || "onError" in s))
             throw new Error("Middleware must be an object with one of `onRequest()`, `onResponse() or `onError()`");
-          y.push(s);
+          p.push(s);
         }
     },
     /** Unregister middleware */
     eject(...a) {
       for (const s of a) {
-        const m = y.indexOf(s);
-        m !== -1 && y.splice(m, 1);
+        const m = p.indexOf(s);
+        m !== -1 && p.splice(m, 1);
       }
     }
   };
 }
-function A(r, t, e) {
+function S(o, t, e) {
   if (t == null)
     return "";
   if (typeof t == "object")
     throw new Error(
       "Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these."
     );
-  return `${r}=${(e == null ? void 0 : e.allowReserved) === !0 ? t : encodeURIComponent(t)}`;
+  return `${o}=${e?.allowReserved === !0 ? t : encodeURIComponent(t)}`;
 }
-function D(r, t, e) {
+function k(o, t, e) {
   if (!t || typeof t != "object")
     return "";
-  const i = [], n = {
+  const n = [], r = {
     simple: ",",
     label: ".",
     matrix: ";"
   }[e.style] || "&";
   if (e.style !== "deepObject" && e.explode === !1) {
-    for (const f in t)
-      i.push(f, e.allowReserved === !0 ? t[f] : encodeURIComponent(t[f]));
-    const l = i.join(",");
+    for (const c in t)
+      n.push(c, e.allowReserved === !0 ? t[c] : encodeURIComponent(t[c]));
+    const l = n.join(",");
     switch (e.style) {
       case "form":
-        return `${r}=${l}`;
+        return `${o}=${l}`;
       case "label":
         return `.${l}`;
       case "matrix":
-        return `;${r}=${l}`;
+        return `;${o}=${l}`;
       default:
         return l;
     }
   }
   for (const l in t) {
-    const f = e.style === "deepObject" ? `${r}[${l}]` : l;
-    i.push(A(f, t[l], e));
+    const c = e.style === "deepObject" ? `${o}[${l}]` : l;
+    n.push(S(c, t[l], e));
   }
-  const o = i.join(n);
-  return e.style === "label" || e.style === "matrix" ? `${n}${o}` : o;
+  const i = n.join(r);
+  return e.style === "label" || e.style === "matrix" ? `${r}${i}` : i;
 }
-function k(r, t, e) {
+function L(o, t, e) {
   if (!Array.isArray(t))
     return "";
   if (e.explode === !1) {
-    const o = { form: ",", spaceDelimited: "%20", pipeDelimited: "|" }[e.style] || ",", l = (e.allowReserved === !0 ? t : t.map((f) => encodeURIComponent(f))).join(o);
+    const i = { form: ",", spaceDelimited: "%20", pipeDelimited: "|" }[e.style] || ",", l = (e.allowReserved === !0 ? t : t.map((c) => encodeURIComponent(c))).join(i);
     switch (e.style) {
       case "simple":
         return l;
       case "label":
         return `.${l}`;
       case "matrix":
-        return `;${r}=${l}`;
+        return `;${o}=${l}`;
       // case "spaceDelimited":
       // case "pipeDelimited":
       default:
-        return `${r}=${l}`;
+        return `${o}=${l}`;
     }
   }
-  const i = { simple: ",", label: ".", matrix: ";" }[e.style] || "&", n = [];
-  for (const o of t)
-    e.style === "simple" || e.style === "label" ? n.push(e.allowReserved === !0 ? o : encodeURIComponent(o)) : n.push(A(r, o, e));
-  return e.style === "label" || e.style === "matrix" ? `${i}${n.join(i)}` : n.join(i);
+  const n = { simple: ",", label: ".", matrix: ";" }[e.style] || "&", r = [];
+  for (const i of t)
+    e.style === "simple" || e.style === "label" ? r.push(e.allowReserved === !0 ? i : encodeURIComponent(i)) : r.push(S(o, i, e));
+  return e.style === "label" || e.style === "matrix" ? `${n}${r.join(n)}` : r.join(n);
 }
-function I(r) {
+function H(o) {
   return function(e) {
-    const i = [];
+    const n = [];
     if (e && typeof e == "object")
-      for (const n in e) {
-        const o = e[n];
-        if (o != null) {
-          if (Array.isArray(o)) {
-            if (o.length === 0)
+      for (const r in e) {
+        const i = e[r];
+        if (i != null) {
+          if (Array.isArray(i)) {
+            if (i.length === 0)
               continue;
-            i.push(
-              k(n, o, {
+            n.push(
+              L(r, i, {
                 style: "form",
                 explode: !0,
-                ...r == null ? void 0 : r.array,
-                allowReserved: (r == null ? void 0 : r.allowReserved) || !1
+                ...o?.array,
+                allowReserved: o?.allowReserved || !1
               })
             );
             continue;
           }
-          if (typeof o == "object") {
-            i.push(
-              D(n, o, {
+          if (typeof i == "object") {
+            n.push(
+              k(r, i, {
                 style: "deepObject",
                 explode: !0,
-                ...r == null ? void 0 : r.object,
-                allowReserved: (r == null ? void 0 : r.allowReserved) || !1
+                ...o?.object,
+                allowReserved: o?.allowReserved || !1
               })
             );
             continue;
           }
-          i.push(A(n, o, r));
+          n.push(S(r, i, o));
         }
       }
-    return i.join("&");
+    return n.join("&");
   };
 }
-function Q(r, t) {
-  let e = r;
-  for (const i of r.match(B) ?? []) {
-    let n = i.substring(1, i.length - 1), o = !1, l = "simple";
-    if (n.endsWith("*") && (o = !0, n = n.substring(0, n.length - 1)), n.startsWith(".") ? (l = "label", n = n.substring(1)) : n.startsWith(";") && (l = "matrix", n = n.substring(1)), !t || t[n] === void 0 || t[n] === null)
+function J(o, t) {
+  let e = o;
+  for (const n of o.match(M) ?? []) {
+    let r = n.substring(1, n.length - 1), i = !1, l = "simple";
+    if (r.endsWith("*") && (i = !0, r = r.substring(0, r.length - 1)), r.startsWith(".") ? (l = "label", r = r.substring(1)) : r.startsWith(";") && (l = "matrix", r = r.substring(1)), !t || t[r] === void 0 || t[r] === null)
       continue;
-    const f = t[n];
-    if (Array.isArray(f)) {
-      e = e.replace(i, k(n, f, { style: l, explode: o }));
+    const c = t[r];
+    if (Array.isArray(c)) {
+      e = e.replace(n, L(r, c, { style: l, explode: i }));
       continue;
     }
-    if (typeof f == "object") {
-      e = e.replace(i, D(n, f, { style: l, explode: o }));
+    if (typeof c == "object") {
+      e = e.replace(n, k(r, c, { style: l, explode: i }));
       continue;
     }
     if (l === "matrix") {
-      e = e.replace(i, `;${A(n, f)}`);
+      e = e.replace(n, `;${S(r, c)}`);
       continue;
     }
-    e = e.replace(i, l === "label" ? `.${encodeURIComponent(f)}` : encodeURIComponent(f));
+    e = e.replace(n, l === "label" ? `.${encodeURIComponent(c)}` : encodeURIComponent(c));
   }
   return e;
 }
-function G(r) {
-  return r instanceof FormData ? r : JSON.stringify(r);
+function _(o, t) {
+  return o instanceof FormData ? o : t && (t.get instanceof Function ? t.get("Content-Type") ?? t.get("content-type") : t["Content-Type"] ?? t["content-type"]) === "application/x-www-form-urlencoded" ? new URLSearchParams(o).toString() : JSON.stringify(o);
 }
-function J(r, t) {
-  var n;
-  let e = `${t.baseUrl}${r}`;
-  (n = t.params) != null && n.path && (e = Q(e, t.params.path));
-  let i = t.querySerializer(t.params.query ?? {});
-  return i.startsWith("?") && (i = i.substring(1)), i && (e += `?${i}`), e;
+function K(o, t) {
+  let e = `${t.baseUrl}${o}`;
+  t.params?.path && (e = J(e, t.params.path));
+  let n = t.querySerializer(t.params.query ?? {});
+  return n.startsWith("?") && (n = n.substring(1)), n && (e += `?${n}`), e;
 }
-function _(...r) {
+function D(...o) {
   const t = new Headers();
-  for (const e of r) {
+  for (const e of o) {
     if (!e || typeof e != "object")
       continue;
-    const i = e instanceof Headers ? e.entries() : Object.entries(e);
-    for (const [n, o] of i)
-      if (o === null)
-        t.delete(n);
-      else if (Array.isArray(o))
-        for (const l of o)
-          t.append(n, l);
-      else o !== void 0 && t.set(n, o);
+    const n = e instanceof Headers ? e.entries() : Object.entries(e);
+    for (const [r, i] of n)
+      if (i === null)
+        t.delete(r);
+      else if (Array.isArray(i))
+        for (const l of i)
+          t.append(r, l);
+      else i !== void 0 && t.set(r, i);
   }
   return t;
 }
-function H(r) {
-  return r.endsWith("/") ? r.substring(0, r.length - 1) : r;
+function P(o) {
+  return o.endsWith("/") ? o.substring(0, o.length - 1) : o;
 }
-function V(r) {
+function X(o) {
   const t = {
-    async onRequest({ request: i }) {
-      const n = await r.getCredentials();
-      return i.headers.set("Authorization", `Bearer ${n.token}`), i;
+    async onRequest({ request: n }) {
+      const r = await o.getCredentials();
+      return n.headers.set("Authorization", `Bearer ${r.token}`), (n.method === "POST" || n.method === "PATCH" || n.method === "DELETE") && n.headers.set("Content-Type", "application/vnd.api+json"), n;
     }
-  }, e = W({
+  }, e = G({
     baseUrl: "https://openapi.tidal.com/v2/"
   });
   return e.use(t), e;
 }
 export {
-  V as createAPIClient
+  X as createAPIClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tidal-music/api",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "type": "module",
   "files": [
     "dist"
@@ -17,17 +17,17 @@
     "default": "./dist/index.js"
   },
   "dependencies": {
-    "openapi-fetch": "0.13.4",
-    "@tidal-music/api": "0.2.0"
+    "openapi-fetch": "0.14.0",
+    "@tidal-music/api": "0.4.0"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "3.0.8",
-    "@vitest/ui": "3.0.8",
-    "openapi-typescript": "7.6.1",
-    "typescript": "5.8.2",
-    "vite": "6.2.1",
-    "vite-plugin-dts": "4.5.3",
-    "vitest": "3.0.8",
+    "@vitest/coverage-v8": "3.2.4",
+    "@vitest/ui": "3.2.4",
+    "openapi-typescript": "7.8.0",
+    "typescript": "5.8.3",
+    "vite": "7.0.0",
+    "vite-plugin-dts": "4.5.4",
+    "vitest": "3.2.4",
     "@tidal-music/auth": "^1.3.4",
     "@tidal-music/common": "^0.1.5"
   },