@sebspark/openapi-client 3.0.0 → 4.0.0

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _createStarExport(obj) { Object.keys(obj) .filter((key) => key !== "default" && key !== "__esModule") .forEach((key) => { if (exports.hasOwnProperty(key)) { return; } Object.defineProperty(exports, key, {enumerable: true, configurable: true, get: () => obj[key]}); }); }var __defProp = Object.defineProperty;
+var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
@@ -19,14 +19,14 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 // src/index.ts
-var _retry = require('@sebspark/retry'); _createStarExport(_retry);
+export * from "@sebspark/retry";
 
 // src/client.ts
-var _openapicore = require('@sebspark/openapi-core');
-var _otel = require('@sebspark/otel');
-
-var _axios = require('axios'); var _axios2 = _interopRequireDefault(_axios);
-var _axiosauthrefresh = require('axios-auth-refresh'); var _axiosauthrefresh2 = _interopRequireDefault(_axiosauthrefresh);
+import {fromAxiosError} from "@sebspark/openapi-core";
+import {getLogger} from "@sebspark/otel";
+import {retry} from "@sebspark/retry";
+import axios from "axios";
+import createAuthRefreshInterceptor from "axios-auth-refresh";
 
 // src/paramsSerializer.ts
 var encodeParam = (param) => encodeURIComponent(param);
@@ -83,15 +83,15 @@ var paramsSerializer = (format) => (params) => {
 
 // src/client.ts
 var TypedClient = (baseURL, globalOptions) => {
-  const axiosInstance = _axios2.default.create();
-  const logger = _otel.getLogger.call(void 0, "TypedClient");
-  logger.debug(`client initialized with arrayFormat '${globalOptions == null ? void 0 : globalOptions.arrayFormat}'`);
-  if (globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) {
+  const axiosInstance = axios.create();
+  const logger = getLogger("TypedClient");
+  logger.debug(`client initialized with arrayFormat '${globalOptions?.arrayFormat}'`);
+  if (globalOptions?.authorizationTokenGenerator) {
     logger.debug("authorizationTokenGenerator is set");
     axiosInstance.interceptors.request.use(async (request) => {
       const url = `${request.baseURL}${request.url}`;
       logger.debug(`Intercepting request to ${url}`);
-      if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) && url) {
+      if (globalOptions?.authorizationTokenGenerator && url) {
         try {
           const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(url);
           if (authorizationTokenHeaders) {
@@ -111,29 +111,29 @@ var TypedClient = (baseURL, globalOptions) => {
       return request;
     });
   }
-  if (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) {
+  if (globalOptions?.authorizationTokenRefresh) {
     const refreshAuthLogic = async (failedRequest) => {
-      var _a, _b;
-      if (!_axios2.default.isAxiosError(failedRequest)) {
+      if (!axios.isAxiosError(failedRequest)) {
         logger.error("Failed request is not an axios error", failedRequest);
-        return;
+        throw failedRequest;
       } else {
         logger.debug("Failed request", failedRequest);
       }
       const axiosError = failedRequest;
       logger.debug("Failed request config", axiosError.config);
-      const url = `${(_a = axiosError.config) == null ? void 0 : _a.baseURL}${(_b = axiosError.config) == null ? void 0 : _b.url}`;
-      if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) && url) {
+      const url = `${axiosError.config?.baseURL}${axiosError.config?.url}`;
+      if (globalOptions?.authorizationTokenRefresh && url) {
         logger.debug(`Refreshing token for URL ${url}`);
         try {
-          await (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh(url));
+          await globalOptions?.authorizationTokenRefresh(url);
         } catch (error) {
           logger.error(`Error refreshing token for URL: ${url}`, error);
           throw error;
         }
       }
+      return axiosError.response;
     };
-    _axiosauthrefresh2.default.call(void 0, axiosInstance, refreshAuthLogic);
+    createAuthRefreshInterceptor(axiosInstance, refreshAuthLogic);
   }
   if (logger) {
     axiosInstance.interceptors.request.use((request) => {
@@ -165,12 +165,11 @@ var TypedClient = (baseURL, globalOptions) => {
   return __spreadProps(__spreadValues({}, client), {axiosInstance});
 };
 var callServer = async (axiosInstance, args, logger) => {
-  var _a, _b;
   try {
     const serializer = paramsSerializer(args.arrayFormat);
     logger.debug(`[callServer] typeof serializer: ${typeof serializer}`);
-    const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
-    const {headers, data} = await _retry.retry.call(void 0, () => axiosInstance.request({
+    const body = args.method?.toLowerCase() === "get" || args.method?.toLowerCase() === "delete" ? void 0 : args.body;
+    const {headers, data} = await retry(() => axiosInstance.request({
       baseURL: args.baseUrl,
       url: args.url,
       method: args.method,
@@ -183,7 +182,7 @@ var callServer = async (axiosInstance, args, logger) => {
     }), args.retry);
     return {headers, data};
   } catch (error) {
-    throw _openapicore.fromAxiosError.call(void 0, error);
+    throw fromAxiosError(error);
   }
 };
 var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
@@ -200,34 +199,34 @@ var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
     headers,
     body,
     retry: retry2,
-    arrayFormat: global == null ? void 0 : global.arrayFormat,
-    httpsAgent: extras == null ? void 0 : extras.httpsAgent,
-    httpAgent: extras == null ? void 0 : extras.httpAgent
+    arrayFormat: global?.arrayFormat,
+    httpsAgent: extras?.httpsAgent,
+    httpAgent: extras?.httpAgent
   };
   return merged;
 };
-var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
+var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => a?.[prop] || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce((url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`), url);
 
 // src/graphql/client.ts
-
-
-
-var _openapiauthiam = require('@sebspark/openapi-auth-iam');
-
+import {
+  apiGatewayTokenByUrlGenerator,
+  apiGatewayTokenRefresh
+} from "@sebspark/openapi-auth-iam";
+import {getLogger as getLogger2} from "@sebspark/otel";
 var GatewayGraphqlClient = class {
   constructor(args) {
     this.uri = args.uri;
-    this.logger = _otel.getLogger.call(void 0, "GatewayGraphqlClient");
+    this.logger = getLogger2("GatewayGraphqlClient");
     this.options = {
       timeout: 10 * 1e3,
       authorizationTokenGenerator: async (url) => {
         this.logger.debug(`Generating token for: ${this.uri}`);
-        return _openapiauthiam.apiGatewayTokenByUrlGenerator.call(void 0, args.apiKey)(url);
+        return apiGatewayTokenByUrlGenerator(args.apiKey)(url);
       },
       authorizationTokenRefresh: async (url) => {
         this.logger.debug(`Refreshing token for: ${this.uri}`);
-        return _openapiauthiam.apiGatewayTokenRefresh.call(void 0, )(url);
+        return apiGatewayTokenRefresh()(url);
       }
     };
     this.client = TypedClient(args.uri, this.options);
@@ -257,7 +256,7 @@ var GatewayGraphqlClient = class {
     return false;
   }
 };
-
-
-
-exports.GatewayGraphqlClient = GatewayGraphqlClient; exports.TypedClient = TypedClient;
+export {
+  GatewayGraphqlClient,
+  TypedClient
+};

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@sebspark/openapi-client",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
+  "type": "module",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
     "generate": "yarn openapi-typegen -i ./src/test/ -o ./src/test/",
-    "build": "tsup-node src/index.ts --format esm,cjs --dts",
+    "build": "tsup-node src/index.ts --format esm --target node22 --dts",
     "dev": "tsc --watch --noEmit",
     "lint": "biome check .",
     "test": "vitest run --passWithNoTests --coverage",
@@ -20,19 +21,20 @@
   "devDependencies": {
     "@sebspark/openapi-typegen": "*",
     "@sebspark/otel": "*",
+    "@sebspark/tsconfig": "*",
+    "express": "5.1.0",
     "nock": "14.0.10",
-    "tsconfig": "*",
     "tsup-node": "^0.1.0",
-    "vitest": "4.0.3"
+    "vitest": "4.0.5"
   },
   "dependencies": {
     "@sebspark/openapi-auth-iam": "*",
     "@sebspark/openapi-core": "*",
     "@sebspark/retry": "*",
-    "axios": "^1.12.2",
+    "axios": "1.13.1",
     "axios-auth-refresh": "3.3.6"
   },
   "peerDependencies": {
-    "@sebspark/otel": ">=1.1.3"
+    "@sebspark/otel": ">=2.0.0"
   }
 }

package/dist/index.mjs

@@ -1,263 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
-// src/index.ts
-export * from "@sebspark/retry";
-
-// src/client.ts
-import {fromAxiosError} from "@sebspark/openapi-core";
-import {getLogger} from "@sebspark/otel";
-import {retry} from "@sebspark/retry";
-import axios from "axios";
-import createAuthRefreshInterceptor from "axios-auth-refresh";
-
-// src/paramsSerializer.ts
-var encodeParam = (param) => encodeURIComponent(param);
-var encodeValue = (param, encodeCommas = false) => {
-  if (param instanceof Date) {
-    return encodeURIComponent(param.toISOString());
-  }
-  if (typeof param === "number" || typeof param === "string" || typeof param === "boolean") {
-    if (encodeCommas) {
-      return encodeURIComponent(param);
-    }
-    return param.toString().split(",").map((p) => encodeURIComponent(p)).join(",");
-  }
-  return "";
-};
-var paramsSerializer = (format) => (params) => {
-  if (!params) {
-    return "";
-  }
-  const s = [];
-  for (const [key, value] of Object.entries(params)) {
-    if (value === void 0) {
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const title = encodeParam(key);
-      if (format === "comma") {
-        s.push(`${title}=${value.map((v) => encodeValue(v, true)).join(",")}`);
-        continue;
-      }
-      value.forEach((v, ix) => {
-        const value2 = encodeValue(v);
-        switch (format) {
-          case "indices": {
-            s.push(`${title}[${ix}]=${value2}`);
-            break;
-          }
-          case "repeat": {
-            s.push(`${title}=${value2}`);
-            break;
-          }
-          default: {
-            s.push(`${title}[]=${value2}`);
-            break;
-          }
-        }
-      });
-    } else {
-      s.push(`${encodeParam(key)}=${encodeValue(value)}`);
-    }
-  }
-  return s.join("&");
-};
-
-// src/client.ts
-var TypedClient = (baseURL, globalOptions) => {
-  const axiosInstance = axios.create();
-  const logger = getLogger("TypedClient");
-  logger.debug(`client initialized with arrayFormat '${globalOptions == null ? void 0 : globalOptions.arrayFormat}'`);
-  if (globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) {
-    logger.debug("authorizationTokenGenerator is set");
-    axiosInstance.interceptors.request.use(async (request) => {
-      const url = `${request.baseURL}${request.url}`;
-      logger.debug(`Intercepting request to ${url}`);
-      if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) && url) {
-        try {
-          const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(url);
-          if (authorizationTokenHeaders) {
-            for (const key of Object.keys(authorizationTokenHeaders)) {
-              const value = authorizationTokenHeaders[key];
-              logger.debug(`Setting header ${key} to ${value}`);
-              request.headers[key] = value;
-            }
-          }
-        } catch (error) {
-          logger.error(`Error generating token for URL: ${url}`, error);
-          throw error;
-        }
-      }
-      logger.debug("Intercepted request:");
-      logger.debug(JSON.stringify(request, null, 2));
-      return request;
-    });
-  }
-  if (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) {
-    const refreshAuthLogic = async (failedRequest) => {
-      var _a, _b;
-      if (!axios.isAxiosError(failedRequest)) {
-        logger.error("Failed request is not an axios error", failedRequest);
-        return;
-      } else {
-        logger.debug("Failed request", failedRequest);
-      }
-      const axiosError = failedRequest;
-      logger.debug("Failed request config", axiosError.config);
-      const url = `${(_a = axiosError.config) == null ? void 0 : _a.baseURL}${(_b = axiosError.config) == null ? void 0 : _b.url}`;
-      if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) && url) {
-        logger.debug(`Refreshing token for URL ${url}`);
-        try {
-          await (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh(url));
-        } catch (error) {
-          logger.error(`Error refreshing token for URL: ${url}`, error);
-          throw error;
-        }
-      }
-    };
-    createAuthRefreshInterceptor(axiosInstance, refreshAuthLogic);
-  }
-  if (logger) {
-    axiosInstance.interceptors.request.use((request) => {
-      const requestObject = {
-        url: request.url,
-        params: request.params,
-        headers: request.headers
-      };
-      logger.debug("request", requestObject);
-      return request;
-    });
-    axiosInstance.interceptors.response.use((response) => {
-      const responseObject = {
-        data: response.data,
-        config: response.config,
-        headers: response.headers
-      };
-      logger.debug("response", responseObject);
-      return response;
-    });
-  }
-  const client = {
-    get: (url, args, opts) => callServer(axiosInstance, mergeArgs(baseURL, url, "get", args, opts, globalOptions), logger),
-    post: (url, args, opts) => callServer(axiosInstance, mergeArgs(baseURL, url, "post", args, opts, globalOptions), logger),
-    put: (url, args, opts) => callServer(axiosInstance, mergeArgs(baseURL, url, "put", args, opts, globalOptions), logger),
-    patch: (url, args, opts) => callServer(axiosInstance, mergeArgs(baseURL, url, "patch", args, opts, globalOptions), logger),
-    delete: (url, args, opts) => callServer(axiosInstance, mergeArgs(baseURL, url, "delete", args, opts, globalOptions), logger)
-  };
-  return __spreadProps(__spreadValues({}, client), {axiosInstance});
-};
-var callServer = async (axiosInstance, args, logger) => {
-  var _a, _b;
-  try {
-    const serializer = paramsSerializer(args.arrayFormat);
-    logger.debug(`[callServer] typeof serializer: ${typeof serializer}`);
-    const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
-    const {headers, data} = await retry(() => axiosInstance.request({
-      baseURL: args.baseUrl,
-      url: args.url,
-      method: args.method,
-      headers: args.headers,
-      params: args.params,
-      paramsSerializer: serializer,
-      data: body,
-      httpsAgent: args.httpsAgent,
-      httpAgent: args.httpAgent
-    }), 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,
-    arrayFormat: global == null ? void 0 : global.arrayFormat,
-    httpsAgent: extras == null ? void 0 : extras.httpsAgent,
-    httpAgent: extras == null ? void 0 : extras.httpAgent
-  };
-  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);
-
-// src/graphql/client.ts
-import {
-  apiGatewayTokenByUrlGenerator,
-  apiGatewayTokenRefresh
-} from "@sebspark/openapi-auth-iam";
-import {getLogger as getLogger2} from "@sebspark/otel";
-var GatewayGraphqlClient = class {
-  constructor(args) {
-    this.uri = args.uri;
-    this.logger = getLogger2("GatewayGraphqlClient");
-    this.options = {
-      timeout: 10 * 1e3,
-      authorizationTokenGenerator: async (url) => {
-        this.logger.debug(`Generating token for: ${this.uri}`);
-        return apiGatewayTokenByUrlGenerator(args.apiKey)(url);
-      },
-      authorizationTokenRefresh: async (url) => {
-        this.logger.debug(`Refreshing token for: ${this.uri}`);
-        return apiGatewayTokenRefresh()(url);
-      }
-    };
-    this.client = TypedClient(args.uri, this.options);
-  }
-  async graphql(query, variables) {
-    try {
-      const response = await this.client.post("/graphql", {
-        body: {query: query.trim(), variables}
-      });
-      if (response.data.errors) {
-        this.logger.error(`Error posting graphql query to: ${this.uri}`);
-        throw new Error(response.data.errors.map((e) => e.message).join("\n"));
-      }
-      return response.data.data;
-    } catch (error) {
-      this.logger.error(`Error posting graphql: ${this.uri}`);
-      throw error;
-    }
-  }
-  async isHealthy() {
-    try {
-      await this.client.get("/health");
-      return true;
-    } catch (error) {
-      this.logger.error(error);
-    }
-    return false;
-  }
-};
-export {
-  GatewayGraphqlClient,
-  TypedClient
-};