@robosystems/client 0.2.25 → 0.2.27

package/sdk/client/utils.gen.js

@@ -1,63 +1,12 @@
 "use strict";
 // This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfig = exports.createInterceptors = exports.mergeHeaders = exports.mergeConfigs = exports.getUrl = exports.buildUrl = exports.setAuthParams = exports.getParseAs = exports.createQuerySerializer = void 0;
+exports.createConfig = exports.createInterceptors = exports.mergeHeaders = exports.mergeConfigs = exports.buildUrl = exports.setAuthParams = exports.getParseAs = exports.createQuerySerializer = void 0;
 const auth_gen_1 = require("../core/auth.gen");
 const bodySerializer_gen_1 = require("../core/bodySerializer.gen");
 const pathSerializer_gen_1 = require("../core/pathSerializer.gen");
-const PATH_PARAM_RE = /\{[^{}]+\}/g;
-const defaultPathSerializer = ({ path, url: _url }) => {
-    let url = _url;
-    const matches = _url.match(PATH_PARAM_RE);
-    if (matches) {
-        for (const match of matches) {
-            let explode = false;
-            let name = match.substring(1, match.length - 1);
-            let style = 'simple';
-            if (name.endsWith('*')) {
-                explode = true;
-                name = name.substring(0, name.length - 1);
-            }
-            if (name.startsWith('.')) {
-                name = name.substring(1);
-                style = 'label';
-            }
-            else if (name.startsWith(';')) {
-                name = name.substring(1);
-                style = 'matrix';
-            }
-            const value = path[name];
-            if (value === undefined || value === null) {
-                continue;
-            }
-            if (Array.isArray(value)) {
-                url = url.replace(match, (0, pathSerializer_gen_1.serializeArrayParam)({ explode, name, style, value }));
-                continue;
-            }
-            if (typeof value === 'object') {
-                url = url.replace(match, (0, pathSerializer_gen_1.serializeObjectParam)({
-                    explode,
-                    name,
-                    style,
-                    value: value,
-                    valueOnly: true,
-                }));
-                continue;
-            }
-            if (style === 'matrix') {
-                url = url.replace(match, `;${(0, pathSerializer_gen_1.serializePrimitiveParam)({
-                    name,
-                    value: value,
-                })}`);
-                continue;
-            }
-            const replaceValue = encodeURIComponent(style === 'label' ? `.${value}` : value);
-            url = url.replace(match, replaceValue);
-        }
-    }
-    return url;
-};
-const createQuerySerializer = ({ allowReserved, array, object, } = {}) => {
+const utils_gen_1 = require("../core/utils.gen");
+const createQuerySerializer = ({ parameters = {}, ...args } = {}) => {
     const querySerializer = (queryParams) => {
         const search = [];
         if (queryParams && typeof queryParams === 'object') {
@@ -66,33 +15,34 @@ const createQuerySerializer = ({ allowReserved, array, object, } = {}) => {
                 if (value === undefined || value === null) {
                     continue;
                 }
+                const options = parameters[name] || args;
                 if (Array.isArray(value)) {
                     const serializedArray = (0, pathSerializer_gen_1.serializeArrayParam)({
-                        allowReserved,
+                        allowReserved: options.allowReserved,
                         explode: true,
                         name,
                         style: 'form',
                         value,
-                        ...array,
+                        ...options.array,
                     });
                     if (serializedArray)
                         search.push(serializedArray);
                 }
                 else if (typeof value === 'object') {
                     const serializedObject = (0, pathSerializer_gen_1.serializeObjectParam)({
-                        allowReserved,
+                        allowReserved: options.allowReserved,
                         explode: true,
                         name,
                         style: 'deepObject',
                         value: value,
-                        ...object,
+                        ...options.object,
                     });
                     if (serializedObject)
                         search.push(serializedObject);
                 }
                 else {
                     const serializedPrimitive = (0, pathSerializer_gen_1.serializePrimitiveParam)({
-                        allowReserved,
+                        allowReserved: options.allowReserved,
                         name,
                         value: value,
                     });
@@ -119,8 +69,7 @@ const getParseAs = (contentType) => {
     if (!cleanContent) {
         return;
     }
-    if (cleanContent.startsWith('application/json') ||
-        cleanContent.endsWith('+json')) {
+    if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) {
         return 'json';
     }
     if (cleanContent === 'multipart/form-data') {
@@ -174,35 +123,16 @@ const setAuthParams = async ({ security, ...options }) => {
     }
 };
 exports.setAuthParams = setAuthParams;
-const buildUrl = (options) => {
-    const url = (0, exports.getUrl)({
-        baseUrl: options.baseUrl,
-        path: options.path,
-        query: options.query,
-        querySerializer: typeof options.querySerializer === 'function'
-            ? options.querySerializer
-            : (0, exports.createQuerySerializer)(options.querySerializer),
-        url: options.url,
-    });
-    return url;
-};
+const buildUrl = (options) => (0, utils_gen_1.getUrl)({
+    baseUrl: options.baseUrl,
+    path: options.path,
+    query: options.query,
+    querySerializer: typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : (0, exports.createQuerySerializer)(options.querySerializer),
+    url: options.url,
+});
 exports.buildUrl = buildUrl;
-const getUrl = ({ baseUrl, path, query, querySerializer, url: _url, }) => {
-    const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
-    let url = (baseUrl ?? '') + pathUrl;
-    if (path) {
-        url = defaultPathSerializer({ path, url });
-    }
-    let search = query ? querySerializer(query) : '';
-    if (search.startsWith('?')) {
-        search = search.substring(1);
-    }
-    if (search) {
-        url += `?${search}`;
-    }
-    return url;
-};
-exports.getUrl = getUrl;
 const mergeConfigs = (a, b) => {
     const config = { ...a, ...b };
     if (config.baseUrl?.endsWith('/')) {
@@ -212,13 +142,20 @@ const mergeConfigs = (a, b) => {
     return config;
 };
 exports.mergeConfigs = mergeConfigs;
+const headersEntries = (headers) => {
+    const entries = [];
+    headers.forEach((value, key) => {
+        entries.push([key, value]);
+    });
+    return entries;
+};
 const mergeHeaders = (...headers) => {
     const mergedHeaders = new Headers();
     for (const header of headers) {
-        if (!header || typeof header !== 'object') {
+        if (!header) {
             continue;
         }
-        const iterator = header instanceof Headers ? header.entries() : Object.entries(header);
+        const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header);
         for (const [key, value] of iterator) {
             if (value === null) {
                 mergedHeaders.delete(key);
@@ -240,45 +177,40 @@ const mergeHeaders = (...headers) => {
 exports.mergeHeaders = mergeHeaders;
 class Interceptors {
     constructor() {
-        this._fns = [];
+        this.fns = [];
     }
     clear() {
-        this._fns = [];
+        this.fns = [];
     }
-    getInterceptorIndex(id) {
-        if (typeof id === 'number') {
-            return this._fns[id] ? id : -1;
-        }
-        else {
-            return this._fns.indexOf(id);
+    eject(id) {
+        const index = this.getInterceptorIndex(id);
+        if (this.fns[index]) {
+            this.fns[index] = null;
         }
     }
     exists(id) {
         const index = this.getInterceptorIndex(id);
-        return !!this._fns[index];
+        return Boolean(this.fns[index]);
     }
-    eject(id) {
-        const index = this.getInterceptorIndex(id);
-        if (this._fns[index]) {
-            this._fns[index] = null;
+    getInterceptorIndex(id) {
+        if (typeof id === 'number') {
+            return this.fns[id] ? id : -1;
         }
+        return this.fns.indexOf(id);
     }
     update(id, fn) {
         const index = this.getInterceptorIndex(id);
-        if (this._fns[index]) {
-            this._fns[index] = fn;
+        if (this.fns[index]) {
+            this.fns[index] = fn;
             return id;
         }
-        else {
-            return false;
-        }
+        return false;
     }
     use(fn) {
-        this._fns = [...this._fns, fn];
-        return this._fns.length - 1;
+        this.fns.push(fn);
+        return this.fns.length - 1;
     }
 }
-// do not add `Middleware` as return type so we can use _fns internally
 const createInterceptors = () => ({
     error: new Interceptors(),
     request: new Interceptors(),

package/sdk/client/utils.gen.ts

@@ -1,103 +1,19 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { getAuthToken } from '../core/auth.gen';
-import type {
-  QuerySerializer,
-  QuerySerializerOptions,
-} from '../core/bodySerializer.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
 import { jsonBodySerializer } from '../core/bodySerializer.gen';
 import {
   serializeArrayParam,
   serializeObjectParam,
   serializePrimitiveParam,
 } from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
 import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
 
-interface PathSerializer {
-  path: Record<string, unknown>;
-  url: string;
-}
-
-const PATH_PARAM_RE = /\{[^{}]+\}/g;
-
-type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
-type MatrixStyle = 'label' | 'matrix' | 'simple';
-type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
-
-const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
-  let url = _url;
-  const matches = _url.match(PATH_PARAM_RE);
-  if (matches) {
-    for (const match of matches) {
-      let explode = false;
-      let name = match.substring(1, match.length - 1);
-      let style: ArraySeparatorStyle = 'simple';
-
-      if (name.endsWith('*')) {
-        explode = true;
-        name = name.substring(0, name.length - 1);
-      }
-
-      if (name.startsWith('.')) {
-        name = name.substring(1);
-        style = 'label';
-      } else if (name.startsWith(';')) {
-        name = name.substring(1);
-        style = 'matrix';
-      }
-
-      const value = path[name];
-
-      if (value === undefined || value === null) {
-        continue;
-      }
-
-      if (Array.isArray(value)) {
-        url = url.replace(
-          match,
-          serializeArrayParam({ explode, name, style, value }),
-        );
-        continue;
-      }
-
-      if (typeof value === 'object') {
-        url = url.replace(
-          match,
-          serializeObjectParam({
-            explode,
-            name,
-            style,
-            value: value as Record<string, unknown>,
-            valueOnly: true,
-          }),
-        );
-        continue;
-      }
-
-      if (style === 'matrix') {
-        url = url.replace(
-          match,
-          `;${serializePrimitiveParam({
-            name,
-            value: value as string,
-          })}`,
-        );
-        continue;
-      }
-
-      const replaceValue = encodeURIComponent(
-        style === 'label' ? `.${value as string}` : (value as string),
-      );
-      url = url.replace(match, replaceValue);
-    }
-  }
-  return url;
-};
-
 export const createQuerySerializer = <T = unknown>({
-  allowReserved,
-  array,
-  object,
+  parameters = {},
+  ...args
 }: QuerySerializerOptions = {}) => {
   const querySerializer = (queryParams: T) => {
     const search: string[] = [];
@@ -109,29 +25,31 @@ export const createQuerySerializer = <T = unknown>({
           continue;
         }
 
+        const options = parameters[name] || args;
+
         if (Array.isArray(value)) {
           const serializedArray = serializeArrayParam({
-            allowReserved,
+            allowReserved: options.allowReserved,
             explode: true,
             name,
             style: 'form',
             value,
-            ...array,
+            ...options.array,
           });
           if (serializedArray) search.push(serializedArray);
         } else if (typeof value === 'object') {
           const serializedObject = serializeObjectParam({
-            allowReserved,
+            allowReserved: options.allowReserved,
             explode: true,
             name,
             style: 'deepObject',
             value: value as Record<string, unknown>,
-            ...object,
+            ...options.object,
           });
           if (serializedObject) search.push(serializedObject);
         } else {
           const serializedPrimitive = serializePrimitiveParam({
-            allowReserved,
+            allowReserved: options.allowReserved,
             name,
             value: value as string,
           });
@@ -147,9 +65,7 @@ export const createQuerySerializer = <T = unknown>({
 /**
  * Infers parseAs value from provided Content-Type header.
  */
-export const getParseAs = (
-  contentType: string | null,
-): Exclude<Config['parseAs'], 'auto'> => {
+export const getParseAs = (contentType: string | null): Exclude<Config['parseAs'], 'auto'> => {
   if (!contentType) {
     // If no Content-Type header is provided, the best we can do is return the raw response body,
     // which is effectively the same as the 'stream' option.
@@ -162,10 +78,7 @@ export const getParseAs = (
     return;
   }
 
-  if (
-    cleanContent.startsWith('application/json') ||
-    cleanContent.endsWith('+json')
-  ) {
+  if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) {
     return 'json';
   }
 
@@ -174,9 +87,7 @@ export const getParseAs = (
   }
 
   if (
-    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
-      cleanContent.startsWith(type),
-    )
+    ['application/', 'audio/', 'image/', 'video/'].some((type) => cleanContent.startsWith(type))
   ) {
     return 'blob';
   }
@@ -245,8 +156,8 @@ export const setAuthParams = async ({
   }
 };
 
-export const buildUrl: Client['buildUrl'] = (options) => {
-  const url = getUrl({
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
     baseUrl: options.baseUrl as string,
     path: options.path,
     query: options.query,
@@ -256,36 +167,6 @@ export const buildUrl: Client['buildUrl'] = (options) => {
         : createQuerySerializer(options.querySerializer),
     url: options.url,
   });
-  return url;
-};
-
-export const getUrl = ({
-  baseUrl,
-  path,
-  query,
-  querySerializer,
-  url: _url,
-}: {
-  baseUrl?: string;
-  path?: Record<string, unknown>;
-  query?: Record<string, unknown>;
-  querySerializer: QuerySerializer;
-  url: string;
-}) => {
-  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
-  let url = (baseUrl ?? '') + pathUrl;
-  if (path) {
-    url = defaultPathSerializer({ path, url });
-  }
-  let search = query ? querySerializer(query) : '';
-  if (search.startsWith('?')) {
-    search = search.substring(1);
-  }
-  if (search) {
-    url += `?${search}`;
-  }
-  return url;
-};
 
 export const mergeConfigs = (a: Config, b: Config): Config => {
   const config = { ...a, ...b };
@@ -296,17 +177,24 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
   return config;
 };
 
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
 export const mergeHeaders = (
   ...headers: Array<Required<Config>['headers'] | undefined>
 ): Headers => {
   const mergedHeaders = new Headers();
   for (const header of headers) {
-    if (!header || typeof header !== 'object') {
+    if (!header) {
       continue;
     }
 
-    const iterator =
-      header instanceof Headers ? header.entries() : Object.entries(header);
+    const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header);
 
     for (const [key, value] of iterator) {
       if (value === null) {
@@ -335,10 +223,7 @@ type ErrInterceptor<Err, Res, Req, Options> = (
   options: Options,
 ) => Err | Promise<Err>;
 
-type ReqInterceptor<Req, Options> = (
-  request: Req,
-  options: Options,
-) => Req | Promise<Req>;
+type ReqInterceptor<Req, Options> = (request: Req, options: Options) => Req | Promise<Req>;
 
 type ResInterceptor<Res, Req, Options> = (
   response: Res,
@@ -347,67 +232,58 @@ type ResInterceptor<Res, Req, Options> = (
 ) => Res | Promise<Res>;
 
 class Interceptors<Interceptor> {
-  _fns: (Interceptor | null)[];
+  fns: Array<Interceptor | null> = [];
 
-  constructor() {
-    this._fns = [];
+  clear(): void {
+    this.fns = [];
   }
 
-  clear() {
-    this._fns = [];
-  }
-
-  getInterceptorIndex(id: number | Interceptor): number {
-    if (typeof id === 'number') {
-      return this._fns[id] ? id : -1;
-    } else {
-      return this._fns.indexOf(id);
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
     }
   }
-  exists(id: number | Interceptor) {
+
+  exists(id: number | Interceptor): boolean {
     const index = this.getInterceptorIndex(id);
-    return !!this._fns[index];
+    return Boolean(this.fns[index]);
   }
 
-  eject(id: number | Interceptor) {
-    const index = this.getInterceptorIndex(id);
-    if (this._fns[index]) {
-      this._fns[index] = null;
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
     }
+    return this.fns.indexOf(id);
   }
 
-  update(id: number | Interceptor, fn: Interceptor) {
+  update(id: number | Interceptor, fn: Interceptor): number | Interceptor | false {
     const index = this.getInterceptorIndex(id);
-    if (this._fns[index]) {
-      this._fns[index] = fn;
+    if (this.fns[index]) {
+      this.fns[index] = fn;
       return id;
-    } else {
-      return false;
     }
+    return false;
   }
 
-  use(fn: Interceptor) {
-    this._fns = [...this._fns, fn];
-    return this._fns.length - 1;
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
   }
 }
 
-// `createInterceptors()` response, meant for external use as it does not
-// expose internals
 export interface Middleware<Req, Res, Err, Options> {
-  error: Pick<
-    Interceptors<ErrInterceptor<Err, Res, Req, Options>>,
-    'eject' | 'use'
-  >;
-  request: Pick<Interceptors<ReqInterceptor<Req, Options>>, 'eject' | 'use'>;
-  response: Pick<
-    Interceptors<ResInterceptor<Res, Req, Options>>,
-    'eject' | 'use'
-  >;
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
 }
 
-// do not add `Middleware` as return type so we can use _fns internally
-export const createInterceptors = <Req, Res, Err, Options>() => ({
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
   error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
   request: new Interceptors<ReqInterceptor<Req, Options>>(),
   response: new Interceptors<ResInterceptor<Res, Req, Options>>(),

package/sdk/client.gen.d.ts

@@ -1,5 +1,5 @@
-import type { ClientOptions } from './types.gen';
-import { type Config, type ClientOptions as DefaultClientOptions } from './client';
+import { type ClientOptions, type Config } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
 /**
  * The `createClientConfig()` function will be called on client initialization
  * and the returned object will become the client's initial configuration.
@@ -8,5 +8,5 @@ import { type Config, type ClientOptions as DefaultClientOptions } from './clien
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 export declare const client: import("./client").Client;

package/sdk/client.gen.js

@@ -3,6 +3,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.client = void 0;
 const client_1 = require("./client");
-exports.client = (0, client_1.createClient)((0, client_1.createConfig)({
-    baseUrl: 'http://localhost:8000'
-}));
+exports.client = (0, client_1.createClient)((0, client_1.createConfig)({ baseUrl: 'http://localhost:8000' }));

package/sdk/client.gen.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { ClientOptions } from './types.gen';
-import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from './client';
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
 
 /**
  * The `createClientConfig()` function will be called on client initialization
@@ -11,8 +11,6 @@ import { type Config, type ClientOptions as DefaultClientOptions, createClient,
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 
-export const client = createClient(createConfig<ClientOptions>({
-    baseUrl: 'http://localhost:8000'
-}));
+export const client = createClient(createConfig<ClientOptions2>({ baseUrl: 'http://localhost:8000' }));

package/sdk/core/auth.gen.ts

@@ -23,8 +23,7 @@ export const getAuthToken = async (
   auth: Auth,
   callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
 ): Promise<string | undefined> => {
-  const token =
-    typeof callback === 'function' ? await callback(auth) : callback;
+  const token = typeof callback === 'function' ? await callback(auth) : callback;
 
   if (!token) {
     return;