@sebspark/openapi-client 1.0.0 → 1.2.0

package/README.md

@@ -27,7 +27,7 @@ import { TypedClient } from '@sebspark/openapi-client'
 import { MarketdataClient } from './schemas/marketdata'
 
 const client = TypedClient<MarketdataClient>(`https://example.com/api`)
-const {data} = await client.get('/markets)
+const {data} = await client.get('/markets')
 ```
 
 ## Example

package/dist/index.js

@@ -41,47 +41,50 @@ var import_retry = require("@sebspark/retry");
 var import_axios = __toESM(require("axios"));
 var TypedClient = (baseURL, globalOptions) => {
   const client = {
-    get: (url, args, opts) => callServer(baseURL, url, "get", args, globalOptions == null ? void 0 : globalOptions.retry, opts == null ? void 0 : opts.retry),
-    post: (url, args, opts) => callServer(baseURL, url, "post", args, globalOptions == null ? void 0 : globalOptions.retry, opts == null ? void 0 : opts.retry),
-    put: (url, args, opts) => callServer(baseURL, url, "put", args, globalOptions == null ? void 0 : globalOptions.retry, opts == null ? void 0 : opts.retry),
-    patch: (url, args, opts) => callServer(
-      baseURL,
-      url,
-      "patch",
-      args,
-      globalOptions == null ? void 0 : globalOptions.retry,
-      opts == null ? void 0 : opts.retry
-    ),
-    delete: (url, args, opts) => callServer(
-      baseURL,
-      url,
-      "delete",
-      args,
-      globalOptions == null ? void 0 : globalOptions.retry,
-      opts == null ? void 0 : opts.retry
-    )
+    get: (url, args, opts) => callServer(mergeArgs(baseURL, url, "get", args, opts, globalOptions)),
+    post: (url, args, opts) => callServer(mergeArgs(baseURL, url, "post", args, opts, globalOptions)),
+    put: (url, args, opts) => callServer(mergeArgs(baseURL, url, "put", args, opts, globalOptions)),
+    patch: (url, args, opts) => callServer(mergeArgs(baseURL, url, "patch", args, opts, globalOptions)),
+    delete: (url, args, opts) => callServer(mergeArgs(baseURL, url, "delete", args, opts, globalOptions))
   };
   return client;
 };
-var callServer = async (baseURL, _url, method, args, ...retrySettings) => {
+var callServer = async (args) => {
   try {
-    const url = setParams(_url, args == null ? void 0 : args.params);
     const { headers, data } = await (0, import_retry.retry)(
       () => import_axios.default.request({
-        baseURL,
-        url,
-        method,
-        headers: args == null ? void 0 : args.headers,
-        params: args == null ? void 0 : args.query,
-        data: args == null ? void 0 : args.body
+        baseURL: args.baseUrl,
+        url: args.url,
+        method: args.method,
+        headers: args.headers,
+        params: args.params,
+        data: args.body
       }),
-      ...retrySettings
+      args.retry
     );
     return { headers, data };
   } catch (error) {
     throw (0, import_openapi_core.fromAxiosError)(error);
   }
 };
+var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
+  const params = merge("params", global, requestArgs, extras);
+  const query = merge("query", global, requestArgs, extras);
+  const headers = merge("headers", global, requestArgs, extras);
+  const body = merge("body", global, requestArgs, extras);
+  const retry2 = merge("retry", global, requestArgs, extras);
+  const merged = {
+    url: setParams(url, params),
+    baseUrl,
+    method,
+    params: query,
+    headers,
+    body,
+    retry: retry2
+  };
+  return merged;
+};
+var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce(
   (url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`),
   url

package/dist/index.mjs

@@ -6,47 +6,50 @@ import { retry } from "@sebspark/retry";
 import axios from "axios";
 var TypedClient = (baseURL, globalOptions) => {
   const client = {
-    get: (url, args, opts) => callServer(baseURL, url, "get", args, globalOptions == null ? void 0 : globalOptions.retry, opts == null ? void 0 : opts.retry),
-    post: (url, args, opts) => callServer(baseURL, url, "post", args, globalOptions == null ? void 0 : globalOptions.retry, opts == null ? void 0 : opts.retry),
-    put: (url, args, opts) => callServer(baseURL, url, "put", args, globalOptions == null ? void 0 : globalOptions.retry, opts == null ? void 0 : opts.retry),
-    patch: (url, args, opts) => callServer(
-      baseURL,
-      url,
-      "patch",
-      args,
-      globalOptions == null ? void 0 : globalOptions.retry,
-      opts == null ? void 0 : opts.retry
-    ),
-    delete: (url, args, opts) => callServer(
-      baseURL,
-      url,
-      "delete",
-      args,
-      globalOptions == null ? void 0 : globalOptions.retry,
-      opts == null ? void 0 : opts.retry
-    )
+    get: (url, args, opts) => callServer(mergeArgs(baseURL, url, "get", args, opts, globalOptions)),
+    post: (url, args, opts) => callServer(mergeArgs(baseURL, url, "post", args, opts, globalOptions)),
+    put: (url, args, opts) => callServer(mergeArgs(baseURL, url, "put", args, opts, globalOptions)),
+    patch: (url, args, opts) => callServer(mergeArgs(baseURL, url, "patch", args, opts, globalOptions)),
+    delete: (url, args, opts) => callServer(mergeArgs(baseURL, url, "delete", args, opts, globalOptions))
   };
   return client;
 };
-var callServer = async (baseURL, _url, method, args, ...retrySettings) => {
+var callServer = async (args) => {
   try {
-    const url = setParams(_url, args == null ? void 0 : args.params);
     const { headers, data } = await retry(
       () => axios.request({
-        baseURL,
-        url,
-        method,
-        headers: args == null ? void 0 : args.headers,
-        params: args == null ? void 0 : args.query,
-        data: args == null ? void 0 : args.body
+        baseURL: args.baseUrl,
+        url: args.url,
+        method: args.method,
+        headers: args.headers,
+        params: args.params,
+        data: args.body
       }),
-      ...retrySettings
+      args.retry
     );
     return { headers, data };
   } catch (error) {
     throw fromAxiosError(error);
   }
 };
+var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
+  const params = merge("params", global, requestArgs, extras);
+  const query = merge("query", global, requestArgs, extras);
+  const headers = merge("headers", global, requestArgs, extras);
+  const body = merge("body", global, requestArgs, extras);
+  const retry2 = merge("retry", global, requestArgs, extras);
+  const merged = {
+    url: setParams(url, params),
+    baseUrl,
+    method,
+    params: query,
+    headers,
+    body,
+    retry: retry2
+  };
+  return merged;
+};
+var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce(
   (url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`),
   url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-client",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -9,18 +9,21 @@
     "dist"
   ],
   "scripts": {
+    "generate": "yarn openapi-typegen -i ./src/test/ -o ./src/test/",
     "build": "tsup-node src/index.ts --format esm,cjs --dts",
     "dev": "tsc --watch --noEmit",
     "lint": "biome check .",
     "test": "vitest --passWithNoTests --coverage",
+    "pretest": "yarn generate",
     "typecheck": "vitest --typecheck.only --passWithNoTests"
   },
   "devDependencies": {
+    "@sebspark/openapi-typegen": "*",
     "tsconfig": "*"
   },
   "dependencies": {
     "@sebspark/openapi-core": "*",
     "@sebspark/retry": "*",
-    "axios": "1.6.5"
+    "axios": "1.6.7"
   }
-}
+}