@blorp-labs/piefed-api-client 0.0.0-7e59b13 → 0.0.0-90bfbe5

package/src/create-client.ts

@@ -26,9 +26,16 @@ const allFns = {
 
 // Only the async API functions (not URL helpers or type exports)
 type AsyncFn = (...args: any[]) => Promise<any>;
-type ApiFunctions = {
-  [K in keyof typeof allFns as (typeof allFns)[K] extends AsyncFn ? K : never]: (typeof allFns)[K];
-};
+type AllModules =
+  typeof admin & typeof comment & typeof community & typeof feed & typeof misc &
+  typeof post & typeof privateMessage & typeof site & typeof topic & typeof upload & typeof user;
+type AsyncKeys = { [K in keyof AllModules]: AllModules[K] extends AsyncFn ? K : never }[keyof AllModules];
+type ApiFunctions = Pick<AllModules, AsyncKeys>;
+
+interface CreateClientOptions extends Omit<RequestInit, 'body' | 'method'> {
+  /** Default headers merged into every request (e.g. Authorization). */
+  headers?: Record<string, string>;
+}
 
 /**
  * Create a client bound to a specific PieFed instance.
@@ -37,32 +44,41 @@ type ApiFunctions = {
  * const client = createClient('https://piefed.social');
  * const site = await client.getApiAlphaSite();
  *
+ * // With auth:
+ * const client = createClient('https://piefed.social', {
+ *   headers: { Authorization: 'Bearer <token>' },
+ * });
+ *
  * // Two instances at the same time:
  * const a = createClient('https://instance-a.com');
  * const b = createClient('https://instance-b.com');
  */
-export function createClient(baseUrl: string): ApiFunctions {
+export function createClient(baseUrl: string, options: CreateClientOptions = {}): ApiFunctions {
   const boundFns = {} as Record<string, AsyncFn>;
 
   for (const [key, fn] of Object.entries(allFns)) {
     if (typeof fn !== 'function') continue;
 
+    // fn.length is the total param count; options is always the last param
+    const optionsIndex = (fn as AsyncFn).length - 1;
+
     boundFns[key] = (...args: unknown[]) => {
-      // options is always the last argument; inject baseUrl into it
-      const last = args[args.length - 1];
-      if (last !== null && typeof last === 'object' && !Array.isArray(last)) {
-        args[args.length - 1] = { ...last as object, baseUrl };
-      } else if (last === undefined || args.length === 0) {
-        // either no args or options was explicitly undefined
-        if (args.length > 0) {
-          args[args.length - 1] = { baseUrl };
-        } else {
-          args.push({ baseUrl });
-        }
-      } else {
-        // last arg is a non-options value (e.g. a body object) — append options
-        args.push({ baseUrl });
-      }
+      // Pad args so options index is always reachable
+      while (args.length <= optionsIndex) args.push(undefined);
+
+      const { headers: defaultHeaders, ...defaultInit } = options;
+      const extra: RequestInit & { baseUrl: string } = { ...defaultInit, baseUrl };
+      const existing = args[optionsIndex] as (RequestInit & { baseUrl?: string }) | undefined;
+
+      args[optionsIndex] = {
+        ...extra,
+        ...existing,
+        headers: {
+          ...defaultHeaders,
+          ...(existing?.headers as Record<string, string> | undefined),
+        },
+      };
+
       return (fn as AsyncFn)(...args);
     };
   }

package/src/index.ts

@@ -1,19 +1,6 @@
 // Configuration and client factory
-export { configure } from './mutator/custom-fetch';
+export { ApiError } from './mutator/custom-fetch';
 export { createClient } from './create-client';
 
 // Re-export generated TypeScript types/schemas
 export * from './schemas/index';
-
-// Re-export generated fetch client functions (tags-split)
-export * from './client/admin/admin';
-export * from './client/comment/comment';
-export * from './client/community/community';
-export * from './client/feed/feed';
-export * from './client/misc/misc';
-export * from './client/post/post';
-export * from './client/private-message/private-message';
-export * from './client/site/site';
-export * from './client/topic/topic';
-export * from './client/upload/upload';
-export * from './client/user/user';

package/src/mutator/custom-fetch.ts

@@ -7,21 +7,35 @@ declare global {
   }
 }
 
-let _defaultBaseUrl = 'https://piefed.social';
+export class ApiError extends Error {
+  constructor(
+    public readonly status: number,
+    public readonly data: unknown,
+  ) {
+    super(`API error ${status}`);
+    this.name = 'ApiError';
+  }
+}
 
-export function configure(options: { baseUrl: string }) {
-  _defaultBaseUrl = options.baseUrl.replace(/\/$/, '');
+function tryParseJson(text: string): unknown {
+  try { return JSON.parse(text); } catch { return text; }
 }
 
 export const customFetch = async <T>(
   url: string,
   options?: RequestInit,
 ): Promise<T> => {
-  const { baseUrl = _defaultBaseUrl, ...fetchOptions } = options ?? {};
+  const { baseUrl, ...fetchOptions } = options ?? {};
+  if (!baseUrl) throw new Error('baseUrl is required — use createClient() to make requests');
   const base = baseUrl.replace(/\/$/, '');
 
   const res = await fetch(`${base}${url}`, fetchOptions);
   const body = [204, 205, 304].includes(res.status) ? null : await res.text();
-  const data = body ? JSON.parse(body) : {};
-  return { data, status: res.status, headers: res.headers } as T;
+  const data = body ? tryParseJson(body) : {};
+
+  if (!res.ok) {
+    throw new ApiError(res.status, data);
+  }
+
+  return data as T;
 };