@scalar/api-client 2.2.47 → 2.2.48

package/dist/libs/send-request/create-request-operation.js

@@ -1,53 +1,49 @@
-import { ERRORS as w, normalizeError as g } from "../errors.js";
+import { ERRORS as k, normalizeError as g } from "../errors.js";
 import { normalizeHeaders as A } from "../normalize-headers.js";
 import { createFetchBody as I } from "./create-fetch-body.js";
 import { createFetchHeaders as Q } from "./create-fetch-headers.js";
 import { createFetchQueryParams as V } from "./create-fetch-query-params.js";
 import { decodeBuffer as X } from "./decode-buffer.js";
 import { setRequestCookies as $, getCookieHeader as K } from "./set-request-cookies.js";
-import { replaceTemplateVariables as h } from "../string-template.js";
-import { isDefined as M, mergeUrls as Y, shouldUseProxy as u } from "@scalar/oas-utils/helpers";
+import { replaceTemplateVariables as c } from "../string-template.js";
+import { isDefined as M, mergeUrls as Y, shouldUseProxy as p } from "@scalar/oas-utils/helpers";
 import { buildRequestSecurity as G } from "./build-request-security.js";
-const ie = ({
-  environment: k,
-  example: s,
-  globalCookies: R,
-  proxyUrl: c,
+const ce = ({
+  environment: R,
+  example: a,
+  globalCookies: C,
+  proxyUrl: s,
   request: d,
-  securitySchemes: C,
-  selectedSecuritySchemeUids: P = [],
+  securitySchemes: P,
+  selectedSecuritySchemeUids: T = [],
   server: i,
-  status: r
+  status: o
 }) => {
   try {
-    const t = k ?? {}, p = new AbortController(), y = s.parameters.path.reduce((o, e) => (e.enabled && (o[e.key] = h(e.value, t)), o), {}), T = h((i == null ? void 0 : i.url) ?? "", t), l = h(d.path, y);
-    let a = T || l;
-    if (!a) throw w.URL_EMPTY;
-    Object.entries((i == null ? void 0 : i.variables) ?? {}).forEach(([o, e]) => {
-      a = h(a, {
-        [o]: y[o] || e.default
+    const t = R ?? {}, y = new AbortController(), S = a.parameters.path.reduce((r, e) => (e.enabled && (r[e.key] = c(e.value, t)), r), {}), q = c((i == null ? void 0 : i.url) ?? "", t), h = c(d.path, S);
+    let n = q || h;
+    if (!n) throw k.URL_EMPTY;
+    Object.entries((i == null ? void 0 : i.variables) ?? {}).forEach(([r, e]) => {
+      n = c(n, {
+        [r]: S[r] || e.default
       });
     });
-    const q = V(s, t), U = Q(s, t), { body: E } = I(d.method, s, t), { cookieParams: H } = $({
-      example: s,
+    const H = V(a, t), U = Q(a, t), { body: L } = I(d.method, a, t), { cookieParams: E } = $({
+      example: a,
       env: t,
-      globalCookies: R,
-      serverUrl: a,
-      proxyUrl: c
-    }), L = P.flat().map((o) => C[o]).filter(M), n = G(L, t);
-    Object.keys(n.headers).forEach((o) => {
-      n.headers[o.toLowerCase()] = n.headers[o] ?? "", delete n.headers[o];
-    });
-    const m = { ...n.headers, ...U }, D = [...H, ...n.cookies], _ = new URLSearchParams([
-      ...q,
-      ...n.urlParams
+      globalCookies: C,
+      serverUrl: n,
+      proxyUrl: s
+    }), D = T.flat().map((r) => P[r]).filter(M), l = G(D, t), m = { ...Object.entries(l.headers).reduce((r, [e, u]) => (r[e.toLowerCase()] = u, r), {}), ...U }, _ = [...E, ...l.cookies], z = new URLSearchParams([
+      ...H,
+      ...l.urlParams
     ]);
-    a = Y(a, l, _);
-    const f = h(
-      K(D, m.Cookie),
+    n = Y(n, h, z);
+    const f = c(
+      K(_, m.Cookie),
       t
     );
-    f && (u(c, a) ? (console.warn(
+    f && (p(s, n) ? (console.warn(
       "We’re using a `X-Scalar-Cookie` custom header to the request. The proxy will forward this as a `Cookie` header. We do this to avoid the browser omitting the `Cookie` header for cross-origin requests for security reasons."
     ), m["X-Scalar-Cookie"] = f) : (console.warn(
       `We’re trying to add a Cookie header, but browsers often omit them for cross-origin requests for various security reasons. If it’s not working, that’s probably why. Here are the requirements for it to work:
@@ -56,56 +52,56 @@ const ie = ({
           - The connection must be made over HTTPS.
           `
     ), m.Cookie = f));
-    const F = new URLSearchParams([["scalar_url", a.toString()]]), B = u(c, a) ? `${c}?${F.toString()}` : a, S = new Request(B, {
+    const F = new URLSearchParams([["scalar_url", n.toString()]]), B = p(s, n) ? `${s}?${F.toString()}` : n, b = new Request(B, {
       method: d.method.toUpperCase(),
-      body: E ?? null,
+      body: L ?? null,
       headers: m
     });
     return [
       null,
       {
-        request: S,
+        request: b,
         sendRequest: async () => {
-          r == null || r.emit("start");
-          const o = Date.now();
+          o == null || o.emit("start");
+          const r = Date.now();
           try {
-            const e = await fetch(S, {
-              signal: p.signal
+            const e = await fetch(b, {
+              signal: y.signal
             });
-            r == null || r.emit("stop");
-            const O = A(
+            o == null || o.emit("stop");
+            const u = A(
               e.headers,
-              u(c, a)
-            ), z = e.headers.get("content-type") ?? "text/plain;charset=UTF-8", b = await e.arrayBuffer(), W = X(b, z), j = "getSetCookie" in e.headers && typeof e.headers.getSetCookie == "function" ? e.headers.getSetCookie() : [];
+              p(s, n)
+            ), O = e.headers.get("content-type") ?? "text/plain;charset=UTF-8", w = await e.arrayBuffer(), W = X(w, O), j = "getSetCookie" in e.headers && typeof e.headers.getSetCookie == "function" ? e.headers.getSetCookie() : [];
             return [
               null,
               {
                 timestamp: Date.now(),
-                request: s,
+                request: a,
                 response: {
                   ...e,
-                  headers: O,
+                  headers: u,
                   cookieHeaderKeys: j,
                   data: W,
-                  size: b.byteLength,
-                  duration: Date.now() - o,
+                  size: w.byteLength,
+                  duration: Date.now() - r,
                   method: d.method,
                   status: e.status,
-                  path: l
+                  path: h
                 }
               }
             ];
           } catch (e) {
-            return r == null || r.emit("abort"), [g(e, w.REQUEST_FAILED), null];
+            return o == null || o.emit("abort"), [g(e, k.REQUEST_FAILED), null];
           }
         },
-        controller: p
+        controller: y
       }
     ];
   } catch (t) {
-    return console.error(t), r == null || r.emit("abort"), [g(t), null];
+    return console.error(t), o == null || o.emit("abort"), [g(t), null];
   }
 };
 export {
-  ie as createRequestOperation
+  ce as createRequestOperation
 };

package/dist/libs/send-request/create-request-operation.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-request-operation.test.d.ts","sourceRoot":"","sources":["../../../src/libs/send-request/create-request-operation.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAElB,oBAAoB,EAIrB,MAAM,iCAAiC,CAAA;AAExC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAO5B,eAAO,MAAM,QAAQ,0BAAkC,CAAA;AAEvD,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEjE,KAAK,kBAAkB,GAAG;IACxB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,qBAAqB,CAAC,EAAE,qBAAqB,CAAA;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,oBAAoB,wBACX,kBAAkB;;;;;;;;;;;;;;;uBAi2BvB,CAAC;;;;;;;;;;;;;uBAW6K,CAAC;mBAAqC,CAAC;kBAAyB,CAAC;mBAA0B,CAAC;iBAAwB,CAAC;oBAA0H,CAAC;qBAAoC,CAAC;uBAA8B,CAAC;;;;;;;;;;;;;;;;;uBAAgpd,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;;uBAA4J,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;;uBAA0J,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;;uBAA4J,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;kBAAwH,CAAC;oBAAoC,CAAC;;;;;2BAA8I,CAAC;wBAA0C,CAAC;2BAAwD,CAAC;2BAA6C,CAAC;4BAA+B,CAAC;+BAAkD,CAAC;wBAA0C,CAAC;4BAAgD,CAAC;0BAA8C,CAAC;wBAA0C,CAAC;4BAA+B,CAAC;;;;eAA4H,CAAC;;;;;;;;;;;;;gBAnuB7+jB,CAAC;iBAAsC,CAAC;;;;;CAhHpE,CAAA"}
+{"version":3,"file":"create-request-operation.test.d.ts","sourceRoot":"","sources":["../../../src/libs/send-request/create-request-operation.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAElB,oBAAoB,EAIrB,MAAM,iCAAiC,CAAA;AAExC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAO5B,eAAO,MAAM,QAAQ,0BAAkC,CAAA;AAEvD,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEjE,KAAK,kBAAkB,GAAG;IACxB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,qBAAqB,CAAC,EAAE,qBAAqB,CAAA;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,oBAAoB,wBACX,kBAAkB;;;;;;;;;;;;;;;uBAi2BvB,CAAC;;;;;;;;;;;;;uBAcV,CAAF;mBAEI,CAAL;kBACO,CAAJ;mBACI,CAAL;iBACK,CAAX;oBAIS,CAAH;qBAEY,CAAC;uBACd,CAAJ;;;;;;;;;;;;;;;;;uBAM0gd,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;;uBAA4J,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;;uBAA0J,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;;uBAA4J,CAAC;oBAAsC,CAAC;uBAAoD,CAAC;uBAAyC,CAAC;wBAA2B,CAAC;2BAA8C,CAAC;oBAAsC,CAAC;wBAA4C,CAAC;sBAA0C,CAAC;oBAAsC,CAAC;wBAA2B,CAAC;;;;;kBAAwH,CAAC;oBAAoC,CAAC;;;;;2BAA8I,CAAC;wBAA0C,CAAC;2BAAwD,CAAC;2BAA6C,CAAC;4BAA+B,CAAC;+BAAkD,CAAC;wBAA0C,CAAC;4BAAgD,CAAC;0BAA8C,CAAC;wBAA0C,CAAC;4BAA+B,CAAC;;;;eAA4H,CAAC;;;;;;;;;;;;;gBAxvBt3iB,CAAC;iBAAsC,CAAC;;;;;CAhHpE,CAAA"}