getta 1.0.20 → 1.0.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "getta",
   "description": "An isomorphic rest client based on the Fetch API.",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "author": "miami-man",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/getta",

package/src/helpers/buildEndpoint/index.ts

@@ -1,5 +1,6 @@
 import { isFunction, omitBy } from 'lodash-es';
 import queryString from 'query-string';
+import { type SearchParams } from '#types.js';
 import { type BuildEndpointOptions } from './types.ts';
 
 export const buildEndpoint = (
@@ -25,12 +26,12 @@ export const buildEndpoint = (
 
 export const appendSearchParams = (
   endpoint: string,
-  searchParams: Record<string, string> | ((endpoint: string) => Record<string, string>),
-  searchParamOverrides: Record<string, string> = {},
+  searchParams: SearchParams,
+  extraSearchParam: Record<string, string> = {},
 ) => {
   const mergedSearchParams = {
-    ...(isFunction(searchParams) ? searchParams(endpoint) : searchParams),
-    ...searchParamOverrides,
+    ...(isFunction(searchParams) ? searchParams(endpoint, extraSearchParam) : searchParams),
+    ...extraSearchParam,
   };
 
   // We have seen instances where value can be undefined

package/src/main.ts

@@ -25,6 +25,7 @@ import {
   type RequestOptions,
   type RequestQueue,
   type RequestTracker,
+  type SearchParams,
   type ShortcutProperties,
   type Shortcuts,
   type StreamReader,
@@ -44,7 +45,7 @@ export class Getta {
   private _pathTemplateCallback: PathTemplateCallback;
   private _pathTemplateRegExp: RegExp;
   private _performance: Performance;
-  private _queryParams: Record<string, string> | ((endpoint: string) => Record<string, string>);
+  private _queryParams: SearchParams;
   private _rateLimit: boolean;
   private _rateLimitCount = 0;
   private _rateLimitedRequestQueue: RequestQueue = [];

package/src/types.ts

@@ -18,6 +18,10 @@ export type ShortcutProperties<T extends string | number> = Record<
   <Resource = PlainObject>(...args: any[]) => Promise<FetchResponse<Resource>>
 >;
 
+export type SearchParams =
+  | Record<string, string>
+  | ((endpoint: string, extraSearchParams?: Record<string, string>) => Record<string, string>);
+
 export interface ConstructorOptions {
   /**
    * The base path of the url for all requests made from
@@ -91,7 +95,7 @@ export interface ConstructorOptions {
   /**
    * Any query params to attach to every request.
    */
-  queryParams?: Record<string, string> | ((endpoint: string) => Record<string, string>);
+  queryParams?: SearchParams;
   /**
    * Whether to enable the rate limit feature.
    */