@sebspark/openapi-client 0.1.0 → 1.0.0

package/README.md

@@ -24,10 +24,10 @@ Use [@sebspark/openapi-typegen](../packages/openapi-typegen)
 
 ```typescript
 import { TypedClient } from '@sebspark/openapi-client'
-import { MarketdataAPIClient } from './schemas/marketdata'
+import { MarketdataClient } from './schemas/marketdata'
 
-const client = TypedClient<MarketdataAPIClient>(`https://example.com/api`)
-const markets = await client.get('/markets)
+const client = TypedClient<MarketdataClient>(`https://example.com/api`)
+const {data} = await client.get('/markets)
 ```
 
 ## Example

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import { BaseClient, ClientOptions } from '@sebspark/openapi-core';
+export * from '@sebspark/retry';
 
 declare const TypedClient: <C extends Partial<BaseClient>>(baseURL: string, globalOptions?: ClientOptions) => C;
 

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { BaseClient, ClientOptions } from '@sebspark/openapi-core';
+export * from '@sebspark/retry';
 
 declare const TypedClient: <C extends Partial<BaseClient>>(baseURL: string, globalOptions?: ClientOptions) => C;
 

package/dist/index.js

@@ -17,6 +17,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -36,36 +37,8 @@ module.exports = __toCommonJS(src_exports);
 
 // src/client.ts
 var import_openapi_core = require("@sebspark/openapi-core");
+var import_retry = require("@sebspark/retry");
 var import_axios = __toESM(require("axios"));
-
-// src/retry.ts
-var defaultSettings = {
-  retryCondition: () => true
-};
-var wait = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-var retry = async (func, ...settings) => {
-  const s = settings.filter((s2) => s2);
-  if (!s.length)
-    return func();
-  const merged = Object.assign(defaultSettings, ...s);
-  const makeCall = async (retries = 0) => {
-    try {
-      const response = await func();
-      return response;
-    } catch (error) {
-      if (merged.retryCondition(error) && retries < merged.maxRetries) {
-        retries++;
-        await wait(merged.interval(retries));
-        return makeCall(retries);
-      } else {
-        throw error;
-      }
-    }
-  };
-  return makeCall(0);
-};
-
-// src/client.ts
 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),
@@ -93,7 +66,7 @@ var TypedClient = (baseURL, globalOptions) => {
 var callServer = async (baseURL, _url, method, args, ...retrySettings) => {
   try {
     const url = setParams(_url, args == null ? void 0 : args.params);
-    const response = await retry(
+    const { headers, data } = await (0, import_retry.retry)(
       () => import_axios.default.request({
         baseURL,
         url,
@@ -104,7 +77,7 @@ var callServer = async (baseURL, _url, method, args, ...retrySettings) => {
       }),
       ...retrySettings
     );
-    return response.data;
+    return { headers, data };
   } catch (error) {
     throw (0, import_openapi_core.fromAxiosError)(error);
   }
@@ -113,7 +86,11 @@ var setParams = (url, params = {}) => Object.entries(params).reduce(
   (url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`),
   url
 );
+
+// src/index.ts
+__reExport(src_exports, require("@sebspark/retry"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  TypedClient
+  TypedClient,
+  ...require("@sebspark/retry")
 });

package/dist/index.mjs

@@ -2,36 +2,8 @@
 import {
   fromAxiosError
 } from "@sebspark/openapi-core";
+import { retry } from "@sebspark/retry";
 import axios from "axios";
-
-// src/retry.ts
-var defaultSettings = {
-  retryCondition: () => true
-};
-var wait = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-var retry = async (func, ...settings) => {
-  const s = settings.filter((s2) => s2);
-  if (!s.length)
-    return func();
-  const merged = Object.assign(defaultSettings, ...s);
-  const makeCall = async (retries = 0) => {
-    try {
-      const response = await func();
-      return response;
-    } catch (error) {
-      if (merged.retryCondition(error) && retries < merged.maxRetries) {
-        retries++;
-        await wait(merged.interval(retries));
-        return makeCall(retries);
-      } else {
-        throw error;
-      }
-    }
-  };
-  return makeCall(0);
-};
-
-// src/client.ts
 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),
@@ -59,7 +31,7 @@ var TypedClient = (baseURL, globalOptions) => {
 var callServer = async (baseURL, _url, method, args, ...retrySettings) => {
   try {
     const url = setParams(_url, args == null ? void 0 : args.params);
-    const response = await retry(
+    const { headers, data } = await retry(
       () => axios.request({
         baseURL,
         url,
@@ -70,7 +42,7 @@ var callServer = async (baseURL, _url, method, args, ...retrySettings) => {
       }),
       ...retrySettings
     );
-    return response.data;
+    return { headers, data };
   } catch (error) {
     throw fromAxiosError(error);
   }
@@ -79,6 +51,9 @@ var setParams = (url, params = {}) => Object.entries(params).reduce(
   (url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`),
   url
 );
+
+// src/index.ts
+export * from "@sebspark/retry";
 export {
   TypedClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-client",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -11,15 +11,16 @@
   "scripts": {
     "build": "tsup-node src/index.ts --format esm,cjs --dts",
     "dev": "tsc --watch --noEmit",
-    "lint": "eslint \"src/**/*.ts*\"",
+    "lint": "biome check .",
     "test": "vitest --passWithNoTests --coverage",
-    "typecheck": "vitest typecheck --passWithNoTests"
+    "typecheck": "vitest --typecheck.only --passWithNoTests"
   },
   "devDependencies": {
     "tsconfig": "*"
   },
   "dependencies": {
     "@sebspark/openapi-core": "*",
-    "axios": "1.6.0"
+    "@sebspark/retry": "*",
+    "axios": "1.6.5"
   }
 }