@scalar/api-client 0.5.0 → 0.5.1

package/dist/components/ApiClient/Request/RequestHeaders.vue.d.ts

@@ -1,12 +1,10 @@
 declare const _default: import("vue").DefineComponent<{
     headers: {
         type: import("vue").PropType<any[]>;
-        required: true;
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     headers: {
         type: import("vue").PropType<any[]>;
-        required: true;
     };
 }>>, {}, {}>;
 export default _default;

package/dist/components/ApiClient/Request/RequestHeaders.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestHeaders.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/ApiClient/Request/RequestHeaders.vue.ts"],"names":[],"mappings":";;;;;;;;;;;AAyFA,wBAAkD"}
+{"version":3,"file":"RequestHeaders.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/ApiClient/Request/RequestHeaders.vue.ts"],"names":[],"mappings":";;;;;;;;;AAyFA,wBAAkD"}

package/dist/components/ApiClient/Request/RequestQuery.vue.d.ts

@@ -1,12 +1,10 @@
 declare const _default: import("vue").DefineComponent<{
     queries: {
         type: import("vue").PropType<import("../../../types").BaseParameter[]>;
-        required: true;
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     queries: {
         type: import("vue").PropType<import("../../../types").BaseParameter[]>;
-        required: true;
     };
 }>>, {}, {}>;
 export default _default;

package/dist/components/ApiClient/Request/RequestQuery.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestQuery.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/ApiClient/Request/RequestQuery.vue.ts"],"names":[],"mappings":";;;;;;;;;;;AA0FA,wBAAkD"}
+{"version":3,"file":"RequestQuery.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/ApiClient/Request/RequestQuery.vue.ts"],"names":[],"mappings":";;;;;;;;;AA0FA,wBAAkD"}

package/dist/components/ApiClient/Request/RequestVariables.vue.d.ts

@@ -1,13 +1,11 @@
 import type { BaseParameter } from '../../../types';
 declare const _default: import("vue").DefineComponent<{
-    paths: {
+    variables: {
         type: import("vue").PropType<BaseParameter[]>;
-        required: true;
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    paths: {
+    variables: {
         type: import("vue").PropType<BaseParameter[]>;
-        required: true;
     };
 }>>, {}, {}>;
 export default _default;

package/dist/components/ApiClient/Request/RequestVariables.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestVariables.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/ApiClient/Request/RequestVariables.vue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;;;;;;;;;;;;AAwFnD,wBAAkD"}
+{"version":3,"file":"RequestVariables.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/ApiClient/Request/RequestVariables.vue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;;;;;;;;;;AAwFnD,wBAAkD"}

package/dist/helpers/concatenateUrlAndPath.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Make sure the URL and path are concatenated correctly.
+ */
+export declare const concatenateUrlAndPath: (url: string, path?: string) => string;
+//# sourceMappingURL=concatenateUrlAndPath.d.ts.map

package/dist/helpers/concatenateUrlAndPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"concatenateUrlAndPath.d.ts","sourceRoot":"","sources":["../../src/helpers/concatenateUrlAndPath.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,qBAAqB,QAAS,MAAM,SAAS,MAAM,WAS/D,CAAA"}

package/dist/helpers/index.d.ts

@@ -1,6 +1,11 @@
+export { concatenateUrlAndPath } from './concatenateUrlAndPath';
 export { createPlaceholderRequest } from './createPlaceholderRequest';
-export { generateRequest } from './generateRequest';
 export { generateParameters } from './generateParameters';
+export { generateRequest } from './generateRequest';
 export { mapFromArray } from './mapFromArray';
+export { normalizePath } from './normalizePath';
+export { normalizeRequestMethod } from './normalizeRequestMethod';
+export { normalizeUrl } from './normalizeUrl';
+export { replaceVariables } from './replaceVariables';
 export { sendRequest } from './sendRequest';
 //# sourceMappingURL=index.d.ts.map

package/dist/helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA"}

package/dist/helpers/normalizePath.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Normalizes a path by removing leading slashes.
+ */
+export declare const normalizePath: (path?: string) => string;
+//# sourceMappingURL=normalizePath.d.ts.map

package/dist/helpers/normalizePath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizePath.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizePath.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,aAAa,UAAW,MAAM,WAY1C,CAAA"}

package/dist/helpers/normalizeRequestMethod.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Get a normalized request method (e.g. GET, POST, etc.)
+ */
+export declare const normalizeRequestMethod: (method?: string) => string;
+//# sourceMappingURL=normalizeRequestMethod.d.ts.map

package/dist/helpers/normalizeRequestMethod.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeRequestMethod.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeRequestMethod.ts"],"names":[],"mappings":"AAcA;;GAEG;AACH,eAAO,MAAM,sBAAsB,YAAa,MAAM,WAyBrD,CAAA"}

package/dist/helpers/normalizeUrl.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Normalizes a URL by trimming it and adding http:// as the default prefix.
+ */
+export declare const normalizeUrl: (url?: string) => string;
+//# sourceMappingURL=normalizeUrl.d.ts.map

package/dist/helpers/normalizeUrl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeUrl.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeUrl.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,YAAY,SAAU,MAAM,WAoBxC,CAAA"}

package/dist/helpers/replaceVariables.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Replaces variables in a url with the values provided.
+ */
+export declare const replaceVariables: (url: string, variables: Record<string, string | number>) => string;
+//# sourceMappingURL=replaceVariables.d.ts.map

package/dist/helpers/replaceVariables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"replaceVariables.d.ts","sourceRoot":"","sources":["../../src/helpers/replaceVariables.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,gBAAgB,QACtB,MAAM,aACA,OAAO,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,WAK3C,CAAA"}

package/dist/helpers/sendRequest.d.ts

@@ -1,6 +1,6 @@
-import type { ClientRequestConfig, RequestResult } from '../types';
+import type { RequestResult, SendRequestConfig } from '../types';
 /**
  * Send a request via the proxy
  */
-export declare function sendRequest(request: ClientRequestConfig, proxyUrl: string): Promise<RequestResult | null>;
+export declare function sendRequest(request: SendRequestConfig, proxyUrl?: string): Promise<RequestResult | null>;
 //# sourceMappingURL=sendRequest.d.ts.map

package/dist/helpers/sendRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendRequest.d.ts","sourceRoot":"","sources":["../../src/helpers/sendRequest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,mBAAmB,EAEnB,aAAa,EACd,MAAM,UAAU,CAAA;AAcjB;;GAEG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAiE/B"}
+{"version":3,"file":"sendRequest.d.ts","sourceRoot":"","sources":["../../src/helpers/sendRequest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,aAAa,EACb,iBAAiB,EAClB,MAAM,UAAU,CAAA;AAcjB;;GAEG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA4E/B"}

package/dist/index.js

@@ -12,7 +12,6 @@
 })();
 import { cloneVNode, h as h$2, Fragment, inject, provide, ref, onMounted, watchEffect, computed, defineComponent, onUnmounted, watch, Teleport, reactive, unref, shallowRef, nextTick, getCurrentScope, onScopeDispose, toRef as toRef$1, readonly, customRef, getCurrentInstance, openBlock, createBlock, withCtx, createElementVNode, createVNode, normalizeClass, normalizeStyle, createTextVNode, toDisplayString, createCommentVNode, renderSlot, createElementBlock, renderList, createStaticVNode, withDirectives, withModifiers, vShow, vModelSelect, vModelText, vModelCheckbox, withKeys } from "vue";
 import { CodeMirror } from "@scalar/use-codemirror";
-import nunjucks from "nunjucks";
 function u$3(r2, n2, ...a2) {
   if (r2 in n2) {
     let e2 = n2[r2];
@@ -5890,6 +5889,41 @@ let nanoid = (size = 21) => crypto.getRandomValues(new Uint8Array(size)).reduce(
   }
   return id;
 }, "");
+const concatenateUrlAndPath = (url, path) => {
+  if (typeof path !== "string" || !path.length) {
+    return url;
+  }
+  const urlWithSlash = url.endsWith("/") ? url : `${url}/`;
+  const pathWithoutSlash = path.startsWith("/") ? path.slice(1) : path;
+  return [urlWithSlash, pathWithoutSlash].join("");
+};
+function generateParameters(parameters) {
+  const params = [];
+  parameters.forEach((parameter) => {
+    const param = {
+      name: parameter.name,
+      value: "",
+      customClass: parameter.required ? "required-parameter" : ""
+    };
+    param.value = "";
+    params.push(param);
+  });
+  return params;
+}
+function generateRequest(operation, parameterMap, server) {
+  const item = {
+    id: operation.operationId,
+    name: operation.name,
+    type: operation.httpVerb,
+    path: operation.path,
+    parameters: generateParameters(parameterMap.path),
+    query: generateParameters(parameterMap.query),
+    headers: generateParameters(parameterMap.header),
+    url: server.url,
+    body: ""
+  };
+  return item;
+}
 function mapFromArray(arr, key, valueKey) {
   const obj = {};
   arr.forEach((entry) => {
@@ -5897,27 +5931,85 @@ function mapFromArray(arr, key, valueKey) {
   });
   return obj;
 }
-const templateEngine = nunjucks.configure({
-  tags: {
-    variableStart: "{",
-    variableEnd: "}"
+const normalizePath = (path) => {
+  if (typeof path !== "string") {
+    return "";
   }
-});
+  let normalizedPath = path.trim();
+  if (normalizedPath.startsWith("/")) {
+    normalizedPath = normalizedPath.slice(1);
+  }
+  return normalizedPath;
+};
+const defaultRequestMethod = "GET";
+const validRequestMethods = [
+  "GET",
+  "POST",
+  "PUT",
+  "HEAD",
+  "DELETE",
+  "PATCH",
+  "OPTIONS",
+  "CONNECT",
+  "TRACE"
+];
+const normalizeRequestMethod = (method) => {
+  if (typeof method !== "string") {
+    console.warn(
+      `[sendRequest] Request method is not a string. Using ${defaultRequestMethod} as the default.`
+    );
+    return defaultRequestMethod;
+  }
+  const normalizedMethod = method.trim().toUpperCase();
+  const isValidRequestMethod = validRequestMethods.includes(normalizedMethod);
+  if (!isValidRequestMethod) {
+    console.warn(
+      `[sendRequest] ${method} is not a valid request method. Using ${defaultRequestMethod} as the default.`
+    );
+    return defaultRequestMethod;
+  }
+  return normalizedMethod;
+};
+const normalizeUrl = (url) => {
+  if (typeof url !== "string") {
+    console.warn(
+      `[sendRequest] URL is not a string. Using an empty string as the default.`
+    );
+    return "";
+  }
+  let normalizedUrl = url.trim().toLowerCase();
+  if (!normalizedUrl.startsWith("http")) {
+    console.warn(
+      `[sendRequest] URL does not start with http. Adding http:// as the default prefix.`
+    );
+    normalizedUrl = `http://${normalizedUrl}`;
+  }
+  return normalizedUrl;
+};
+const replaceVariables = (url, variables) => {
+  return Object.entries(variables).reduce((acc, [key, value]) => {
+    return acc.replace(`{${key}}`, value.toString());
+  }, url);
+};
 const defaultHeaders = {
   "User-Agent": "Scalar API Client"
 };
 async function sendRequest(request, proxyUrl) {
-  const method = request.type.toUpperCase();
-  const fullUrl = `${request.url}${request.path}`;
+  const method = normalizeRequestMethod(request.type);
   const headers = {
     ...defaultHeaders,
-    ...mapFromArray(request.headers, "name", "value")
+    ...mapFromArray(request.headers ?? [], "name", "value")
   };
+  const url = normalizeUrl(request.url);
+  const path = normalizePath(request.path);
+  const urlWithPath = concatenateUrlAndPath(url, path);
+  const renderedURL = replaceVariables(
+    urlWithPath,
+    mapFromArray(request.parameters ?? [], "name", "value")
+  );
   const auth = {
     type: "none"
   };
-  const variables = mapFromArray(request.parameters, "name", "value");
-  const renderedURL = templateEngine.renderString(fullUrl, variables);
   const startTime = Date.now();
   const requestOptions = {
     method,
@@ -5926,31 +6018,45 @@ async function sendRequest(request, proxyUrl) {
     headers,
     data: request.body
   };
-  const config = {
+  const config = proxyUrl ? {
     method: "POST",
     url: proxyUrl,
     data: requestOptions
+  } : {
+    method: requestOptions.method,
+    url: requestOptions.url,
+    headers: requestOptions.headers,
+    data: requestOptions.data
   };
   console.info(`${requestOptions.method} ${requestOptions.url}`);
   const response = (
     // @ts-ignore
-    await axios$1(config).then((res) => ({
-      ...res.data,
-      error: false
-    })).catch((err) => ({
-      error: true,
-      ...err == null ? void 0 : err.response
-    }))
+    await axios$1(config).then((res) => {
+      return {
+        ...res.data,
+        error: false
+      };
+    }).catch((err) => {
+      return {
+        error: true,
+        ...err == null ? void 0 : err.response
+      };
+    })
   );
-  return !response.error ? {
+  return response.error ? null : {
     sentTime: Date.now(),
-    request,
+    request: {
+      ...request,
+      type: method,
+      url,
+      path
+    },
     response: {
       ...response,
       duration: Date.now() - startTime
     },
     responseId: nanoid()
-  } : null;
+  };
 }
 const _hoisted_1$k = { class: "modal-layout" };
 const useModalState = () => reactive({
@@ -7021,7 +7127,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$i), { title: "Headers" }, {
         default: withCtx(() => [
-          _ctx.headers.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_1$b, "No Headers")) : (openBlock(), createBlock(unref(_sfc_main$g), {
+          !_ctx.headers || _ctx.headers.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_1$b, "No Headers")) : (openBlock(), createBlock(unref(_sfc_main$g), {
             key: 1,
             items: _ctx.headers
           }, null, 8, ["items"]))
@@ -7044,7 +7150,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$i), { title: "Query Parameters" }, {
         default: withCtx(() => [
-          _ctx.queries.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_1$a, "No Query Parameters")) : (openBlock(), createBlock(unref(_sfc_main$g), {
+          !_ctx.queries || _ctx.queries.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_1$a, "No Query Parameters")) : (openBlock(), createBlock(unref(_sfc_main$g), {
             key: 1,
             items: _ctx.queries
           }, null, 8, ["items"]))
@@ -7061,15 +7167,15 @@ const _hoisted_1$9 = {
 const _sfc_main$b = /* @__PURE__ */ defineComponent({
   __name: "RequestVariables",
   props: {
-    paths: {}
+    variables: {}
   },
   setup(__props) {
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$i), { title: "Variables" }, {
         default: withCtx(() => [
-          _ctx.paths.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_1$9, "No variables")) : (openBlock(), createBlock(unref(_sfc_main$g), {
+          !_ctx.variables || _ctx.variables.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_1$9, "No variables")) : (openBlock(), createBlock(unref(_sfc_main$g), {
             key: 1,
-            items: _ctx.paths
+            items: _ctx.variables
           }, null, 8, ["items"]))
         ]),
         _: 1
@@ -7109,8 +7215,8 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
         createElementVNode("div", null, [
           createVNode(_sfc_main$h),
           createVNode(_sfc_main$b, {
-            paths: unref(activeRequest2).parameters
-          }, null, 8, ["paths"]),
+            variables: unref(activeRequest2).parameters
+          }, null, 8, ["variables"]),
           createVNode(_sfc_main$c, {
             queries: unref(activeRequest2).query
           }, null, 8, ["queries"]),
@@ -8331,33 +8437,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   }
 });
 const ApiClient_vue_vue_type_style_index_0_lang = "";
-function generateParameters(parameters) {
-  const params = [];
-  parameters.forEach((parameter) => {
-    const param = {
-      name: parameter.name,
-      value: "",
-      customClass: parameter.required ? "required-parameter" : ""
-    };
-    param.value = "";
-    params.push(param);
-  });
-  return params;
-}
-function generateRequest(operation, parameterMap, server) {
-  const item = {
-    id: operation.operationId,
-    name: operation.name,
-    type: operation.httpVerb,
-    path: operation.path,
-    parameters: generateParameters(parameterMap.path),
-    query: generateParameters(parameterMap.query),
-    headers: generateParameters(parameterMap.header),
-    url: server.url,
-    body: ""
-  };
-  return item;
-}
 function useOperation(props) {
   const parameterMap = computed(() => {
     const { parameters } = props.operation.information;
@@ -8385,6 +8464,7 @@ function useOperation(props) {
 }
 export {
   _sfc_main as ApiClient,
+  concatenateUrlAndPath,
   createEmptyAuthState,
   createPlaceholderRequest,
   generateParameters,
@@ -8392,6 +8472,10 @@ export {
   httpHeaders,
   httpStatusCodes,
   mapFromArray,
+  normalizePath,
+  normalizeRequestMethod,
+  normalizeUrl,
+  replaceVariables,
   sendRequest,
   useApiClientRequestStore,
   useApiClientStore,

package/dist/stores/apiClientRequestStore.d.ts

@@ -32,26 +32,26 @@ export declare const useApiClientRequestStore: () => {
     readOnly: import("vue").Ref<boolean>;
     activeRequest: {
         id?: string | undefined;
-        name: string;
+        name?: string | undefined;
         url: string;
         type: string;
         path: string;
-        parameters: {
+        parameters?: {
             name: string;
             value: string | number;
             customClass?: string | undefined;
-        }[];
-        query: {
+        }[] | undefined;
+        query?: {
             name: string;
             value: string | number;
             customClass?: string | undefined;
-        }[];
-        headers: {
+        }[] | undefined;
+        headers?: {
             name: string;
             value: string | number;
             customClass?: string | undefined;
-        }[];
-        body: string;
+        }[] | undefined;
+        body?: string | undefined;
         formData?: {
             name: string;
             value: string | number;

package/dist/types.d.ts

@@ -41,20 +41,21 @@ export type FormDataItem = BaseParameter;
 /** Complete request state for a client request */
 export type ClientRequestConfig = {
     id?: string;
-    name: string;
+    name?: string;
     url: string;
     /** HTTP Request Method */
     type: string;
     /** Request path */
     path: string;
+    /** TODO: Rename to variables? */
     /** Path parameters */
-    parameters: BaseParameter[];
+    parameters?: BaseParameter[];
     /** Query parameters */
-    query: Query[];
+    query?: Query[];
     /** Request headers */
-    headers: Header[];
+    headers?: Header[];
     /** Content type matched body */
-    body: string;
+    body?: string;
     /** Optional form data body */
     formData?: FormDataItem[];
 };
@@ -76,6 +77,7 @@ export type ClientResponse = {
     data: string;
     duration: number;
 };
+export type SendRequestConfig = Partial<ClientRequestConfig> & Required<Pick<ClientRequestConfig, 'url'>>;
 export type RequestResult = {
     request: ClientRequestConfig;
     response: ClientResponse;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -9,7 +9,7 @@
     "graphql",
     "postman alternative"
   ],
-  "version": "0.5.0",
+  "version": "0.5.1",
   "author": "Scalar (https://github.com/scalar)",
   "homepage": "https://github.com/scalar/scalar",
   "repository": {
@@ -42,13 +42,12 @@
     "axios": "1.4.0",
     "javascript-time-ago": "2.5.9",
     "nanoid": "4.0.2",
-    "nunjucks": "3.2.3",
     "pretty-bytes": "6.1.0",
     "pretty-ms": "8.0.0",
     "tippy.js": "6.3.7",
     "@scalar/default-theme": "0.2.1",
-    "@scalar/use-codemirror": "0.5.0",
-    "@scalar/use-keyboard-event": "0.4.1"
+    "@scalar/use-keyboard-event": "0.4.1",
+    "@scalar/use-codemirror": "0.5.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "4.2.3",
@@ -56,11 +55,11 @@
     "vite": "4.4.8",
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vitest": "0.34.1",
-    "vue-tsc": "1.8.8"
+    "vue-tsc": "1.8.8",
+    "@scalar/echo-server": "0.4.1"
   },
   "peerDependencies": {
-    "vue": "3.3.4",
-    "@types/nunjucks": "3.2.2"
+    "vue": "3.3.4"
   },
   "scripts": {
     "build": "vite build && pnpm types:build && tsc-alias -p tsconfig.build.json",

package/src/components/ApiClient/Request/Request.vue

@@ -25,7 +25,7 @@ const { activeRequest, readOnly } = useApiClientRequestStore()
     </div>
     <div>
       <RequestAuth />
-      <RequestVariables :paths="activeRequest.parameters" />
+      <RequestVariables :variables="activeRequest.parameters" />
       <RequestQuery :queries="activeRequest.query" />
       <RequestHeaders :headers="activeRequest.headers" />
       <RequestBody

package/src/components/ApiClient/Request/RequestHeaders.vue

@@ -2,11 +2,11 @@
 import { CollapsibleSection } from '../../CollapsibleSection'
 import { Grid } from '../../Grid'
 
-defineProps<{ headers: any[] }>()
+defineProps<{ headers?: any[] }>()
 </script>
 <template>
   <CollapsibleSection title="Headers">
-    <template v-if="headers.length === 0">
+    <template v-if="!headers || headers.length === 0">
       <div class="scalar-api-client__empty-state">No Headers</div>
     </template>
     <template v-else>

package/src/components/ApiClient/Request/RequestQuery.vue

@@ -3,11 +3,11 @@ import type { Query } from '../../../types'
 import { CollapsibleSection } from '../../CollapsibleSection'
 import { Grid } from '../../Grid'
 
-defineProps<{ queries: Query[] }>()
+defineProps<{ queries?: Query[] }>()
 </script>
 <template>
   <CollapsibleSection title="Query Parameters">
-    <template v-if="queries.length === 0">
+    <template v-if="!queries || queries.length === 0">
       <div class="scalar-api-client__empty-state">No Query Parameters</div>
     </template>
     <template v-else>

package/src/components/ApiClient/Request/RequestVariables.vue

@@ -3,15 +3,15 @@ import type { BaseParameter } from '../../../types'
 import { CollapsibleSection } from '../../CollapsibleSection'
 import { Grid } from '../../Grid'
 
-defineProps<{ paths: BaseParameter[] }>()
+defineProps<{ variables?: BaseParameter[] }>()
 </script>
 <template>
   <CollapsibleSection title="Variables">
-    <template v-if="paths.length === 0">
+    <template v-if="!variables || variables.length === 0">
       <div class="scalar-api-client__empty-state">No variables</div>
     </template>
     <template v-else>
-      <Grid :items="paths" />
+      <Grid :items="variables" />
       <!-- @addAnother="addQuery"
           @deleteItem="deleteQuery"
           @toggleDescription="toggleDescription"

package/src/helpers/concatenateUrlAndPath.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest'
+
+import { concatenateUrlAndPath } from './'
+
+describe('concatenateUrlAndPath', () => {
+  it('trims a slash from the URL', async () => {
+    expect(concatenateUrlAndPath('http://127.0.0.1/', 'foobar')).toBe(
+      'http://127.0.0.1/foobar',
+    )
+  })
+
+  it('adds a slash between url and path', async () => {
+    expect(concatenateUrlAndPath('http://127.0.0.1', 'foobar')).toBe(
+      'http://127.0.0.1/foobar',
+    )
+  })
+
+  it('trims a slash from the path', async () => {
+    expect(concatenateUrlAndPath('http://127.0.0.1', '/foobar')).toBe(
+      'http://127.0.0.1/foobar',
+    )
+  })
+
+  it('works without a path', async () => {
+    expect(concatenateUrlAndPath('http://127.0.0.1')).toBe('http://127.0.0.1')
+  })
+})

package/src/helpers/concatenateUrlAndPath.ts

@@ -0,0 +1,13 @@
+/**
+ * Make sure the URL and path are concatenated correctly.
+ */
+export const concatenateUrlAndPath = (url: string, path?: string) => {
+  if (typeof path !== 'string' || !path.length) {
+    return url
+  }
+
+  const urlWithSlash = url.endsWith('/') ? url : `${url}/`
+  const pathWithoutSlash = path.startsWith('/') ? path.slice(1) : path
+
+  return [urlWithSlash, pathWithoutSlash].join('')
+}

package/src/helpers/index.ts

@@ -1,5 +1,10 @@
+export { concatenateUrlAndPath } from './concatenateUrlAndPath'
 export { createPlaceholderRequest } from './createPlaceholderRequest'
-export { generateRequest } from './generateRequest'
 export { generateParameters } from './generateParameters'
+export { generateRequest } from './generateRequest'
 export { mapFromArray } from './mapFromArray'
+export { normalizePath } from './normalizePath'
+export { normalizeRequestMethod } from './normalizeRequestMethod'
+export { normalizeUrl } from './normalizeUrl'
+export { replaceVariables } from './replaceVariables'
 export { sendRequest } from './sendRequest'

package/src/helpers/normalizePath.test.ts

@@ -0,0 +1,17 @@
+import { describe, expect, it } from 'vitest'
+
+import { normalizePath } from './'
+
+describe('normalizePath', () => {
+  it('keeps a path as is', async () => {
+    expect(normalizePath('foobar')).toBe('foobar')
+  })
+
+  it('removes slash', async () => {
+    expect(normalizePath('/foobar')).toBe('foobar')
+  })
+
+  it('trims whitespace', async () => {
+    expect(normalizePath('foobar ')).toBe('foobar')
+  })
+})

package/src/helpers/normalizePath.ts

@@ -0,0 +1,16 @@
+/**
+ * Normalizes a path by removing leading slashes.
+ */
+export const normalizePath = (path?: string) => {
+  if (typeof path !== 'string') {
+    return ''
+  }
+
+  let normalizedPath = path.trim()
+
+  if (normalizedPath.startsWith('/')) {
+    normalizedPath = normalizedPath.slice(1)
+  }
+
+  return normalizedPath
+}

package/src/helpers/normalizeRequestMethod.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest'
+
+import { normalizeRequestMethod } from './'
+
+describe('normalizeRequestMethod', () => {
+  it('returns a valid request method', async () => {
+    expect(normalizeRequestMethod('GET')).toBe('GET')
+  })
+
+  it('makes method uppercase', async () => {
+    expect(normalizeRequestMethod('get')).toBe('GET')
+  })
+
+  it('return uppercase POST', async () => {
+    expect(normalizeRequestMethod('post')).toBe('POST')
+  })
+
+  it('trims whitespace', async () => {
+    expect(normalizeRequestMethod('post ')).toBe('POST')
+  })
+
+  it('uses GET as the default', async () => {
+    expect(normalizeRequestMethod()).toBe('GET')
+  })
+
+  it('ignores invalid request methods', async () => {
+    expect(normalizeRequestMethod('fantasy')).toBe('GET')
+  })
+})

package/src/helpers/normalizeRequestMethod.ts

@@ -0,0 +1,43 @@
+const defaultRequestMethod = 'GET'
+
+const validRequestMethods = [
+  'GET',
+  'POST',
+  'PUT',
+  'HEAD',
+  'DELETE',
+  'PATCH',
+  'OPTIONS',
+  'CONNECT',
+  'TRACE',
+]
+
+/**
+ * Get a normalized request method (e.g. GET, POST, etc.)
+ */
+export const normalizeRequestMethod = (method?: string) => {
+  // Make sure it’s a string
+  if (typeof method !== 'string') {
+    console.warn(
+      `[sendRequest] Request method is not a string. Using ${defaultRequestMethod} as the default.`,
+    )
+
+    return defaultRequestMethod
+  }
+
+  // Normalize the string
+  const normalizedMethod = method.trim().toUpperCase()
+
+  // Make sure it’s a valid request method
+  const isValidRequestMethod = validRequestMethods.includes(normalizedMethod)
+
+  if (!isValidRequestMethod) {
+    console.warn(
+      `[sendRequest] ${method} is not a valid request method. Using ${defaultRequestMethod} as the default.`,
+    )
+
+    return defaultRequestMethod
+  }
+
+  return normalizedMethod
+}

package/src/helpers/normalizeUrl.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect, it } from 'vitest'
+
+import { normalizeUrl } from './'
+
+describe('normalizeUrl', () => {
+  it('keeps URLs as is', async () => {
+    expect(normalizeUrl('http://127.0.0.1')).toBe('http://127.0.0.1')
+  })
+
+  it('keeps slashes', async () => {
+    expect(normalizeUrl('http://127.0.0.1/')).toBe('http://127.0.0.1/')
+  })
+
+  it('makes URLs lowercase', async () => {
+    expect(normalizeUrl('http://EXAMPLE.COM')).toBe('http://example.com')
+  })
+
+  it('adds http://', async () => {
+    expect(normalizeUrl('example.com')).toBe('http://example.com')
+  })
+
+  it('trims whitespace', async () => {
+    expect(normalizeUrl('http://example.com ')).toBe('http://example.com')
+  })
+})

package/src/helpers/normalizeUrl.ts

@@ -0,0 +1,24 @@
+/**
+ * Normalizes a URL by trimming it and adding http:// as the default prefix.
+ */
+export const normalizeUrl = (url?: string) => {
+  if (typeof url !== 'string') {
+    console.warn(
+      `[sendRequest] URL is not a string. Using an empty string as the default.`,
+    )
+
+    return ''
+  }
+
+  let normalizedUrl = url.trim().toLowerCase()
+
+  if (!normalizedUrl.startsWith('http')) {
+    console.warn(
+      `[sendRequest] URL does not start with http. Adding http:// as the default prefix.`,
+    )
+
+    normalizedUrl = `http://${normalizedUrl}`
+  }
+
+  return normalizedUrl
+}

package/src/helpers/replaceVariables.test.ts

@@ -0,0 +1,13 @@
+import { describe, expect, it } from 'vitest'
+
+import { replaceVariables } from './'
+
+describe('replaceVariables', () => {
+  it('replaces variables', async () => {
+    expect(
+      replaceVariables('http://{baseUrl}/foobar', {
+        baseUrl: 'example.com',
+      }),
+    ).toBe('http://example.com/foobar')
+  })
+})

package/src/helpers/replaceVariables.ts

@@ -0,0 +1,11 @@
+/**
+ * Replaces variables in a url with the values provided.
+ */
+export const replaceVariables = (
+  url: string,
+  variables: Record<string, string | number>,
+) => {
+  return Object.entries(variables).reduce((acc, [key, value]) => {
+    return acc.replace(`{${key}}`, value.toString())
+  }, url)
+}

package/src/helpers/sendRequest.test.ts

@@ -0,0 +1,50 @@
+import { createEchoServer } from '@scalar/echo-server'
+import { describe, expect, it } from 'vitest'
+
+import { sendRequest } from './sendRequest'
+
+const createEchoServerOnAnyPort = (): { address: string; port: number } => {
+  const { listen } = createEchoServer()
+  const instance = listen(0)
+
+  return instance.address()
+}
+
+describe('sendRequest', () => {
+  it('sends requests', async () => {
+    const { port } = createEchoServerOnAnyPort()
+
+    const request = {
+      url: `http://127.0.0.1:${port}`,
+    }
+
+    const result = await sendRequest(request)
+
+    expect(result?.response).toContain({
+      method: 'GET',
+      path: '/',
+    })
+  })
+
+  it('replaces variables', async () => {
+    const { port } = createEchoServerOnAnyPort()
+
+    const request = {
+      url: `http://127.0.0.1:${port}`,
+      path: '{path}',
+      parameters: [
+        {
+          name: 'path',
+          value: 'example',
+        },
+      ],
+    }
+
+    const result = await sendRequest(request)
+
+    expect(result?.response).toContain({
+      method: 'GET',
+      path: '/example',
+    })
+  })
+})

package/src/helpers/sendRequest.ts

@@ -1,20 +1,20 @@
 import axios from 'axios'
 import { nanoid } from 'nanoid'
-import nunjucks from 'nunjucks'
 
 import type {
   ClientRequestConfig,
   ClientResponse,
   RequestResult,
+  SendRequestConfig,
 } from '../types'
-import { mapFromArray } from './mapFromArray'
-
-const templateEngine = nunjucks.configure({
-  tags: {
-    variableStart: '{',
-    variableEnd: '}',
-  },
-})
+import {
+  concatenateUrlAndPath,
+  mapFromArray,
+  normalizePath,
+  normalizeRequestMethod,
+  normalizeUrl,
+  replaceVariables,
+} from './'
 
 const defaultHeaders = {
   'User-Agent': 'Scalar API Client',
@@ -24,24 +24,26 @@ const defaultHeaders = {
  * Send a request via the proxy
  */
 export async function sendRequest(
-  request: ClientRequestConfig,
-  proxyUrl: string,
+  request: SendRequestConfig,
+  proxyUrl?: string,
 ): Promise<RequestResult | null> {
-  // Format complete URL
-  const method = request.type.toUpperCase()
-  const fullUrl = `${request.url}${request.path}`
+  const method = normalizeRequestMethod(request.type)
   const headers: Record<string, string | number> = {
     ...defaultHeaders,
-    ...mapFromArray(request.headers, 'name', 'value'),
+    ...mapFromArray(request.headers ?? [], 'name', 'value'),
   }
+  const url = normalizeUrl(request.url)
+  const path = normalizePath(request.path)
+  const urlWithPath = concatenateUrlAndPath(url, path)
+  const renderedURL = replaceVariables(
+    urlWithPath,
+    mapFromArray(request.parameters ?? [], 'name', 'value'),
+  )
+
   /** TODO: Make dynamic */
   const auth = {
     type: 'none',
   }
-  const variables = mapFromArray(request.parameters, 'name', 'value')
-  const renderedURL = templateEngine.renderString(fullUrl, variables)
-  /** TODO: Make dynamic */
-  const proxy = true
 
   const startTime = Date.now()
 
@@ -53,7 +55,7 @@ export async function sendRequest(
     data: request.body,
   }
 
-  const config = proxy
+  const config = proxyUrl
     ? {
         method: 'POST',
         url: proxyUrl,
@@ -71,24 +73,33 @@ export async function sendRequest(
   const response: (ClientResponse & { error: false }) | { error: true } =
     // @ts-ignore
     await axios(config)
-      .then((res) => ({
-        ...res.data,
-        error: false,
-      }))
-      .catch((err) => ({
-        error: true,
-        ...err?.response,
-      }))
+      .then((res) => {
+        return {
+          ...res.data,
+          error: false,
+        }
+      })
+      .catch((err) => {
+        return {
+          error: true,
+          ...err?.response,
+        }
+      })
 
-  return !response.error
-    ? {
+  return response.error
+    ? null
+    : {
         sentTime: Date.now(),
-        request,
+        request: {
+          ...request,
+          type: method,
+          url,
+          path,
+        },
         response: {
           ...response,
           duration: Date.now() - startTime,
         },
         responseId: nanoid(),
       }
-    : null
 }

package/src/types.ts

@@ -51,20 +51,21 @@ export type FormDataItem = BaseParameter
 /** Complete request state for a client request */
 export type ClientRequestConfig = {
   id?: string
-  name: string
+  name?: string
   url: string
   /** HTTP Request Method */
   type: string
   /** Request path */
   path: string
+  /** TODO: Rename to variables? */
   /** Path parameters */
-  parameters: BaseParameter[]
+  parameters?: BaseParameter[]
   /** Query parameters */
-  query: Query[]
+  query?: Query[]
   /** Request headers */
-  headers: Header[]
+  headers?: Header[]
   /** Content type matched body */
-  body: string
+  body?: string
   /** Optional form data body */
   formData?: FormDataItem[]
 }
@@ -89,6 +90,9 @@ export type ClientResponse = {
   duration: number
 }
 
+export type SendRequestConfig = Partial<ClientRequestConfig> &
+  Required<Pick<ClientRequestConfig, 'url'>>
+
 export type RequestResult = {
   request: ClientRequestConfig
   response: ClientResponse

package/src/hooks/useOperation.test.ts

@@ -1,7 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-describe('example', () => {
-  it('executes tests', () => {
-    expect(true).toBe(true)
-  })
-})