@blorp-labs/piefed-api-client 0.0.0-0935c38 → 0.0.0-774e8e8

package/README.md

@@ -10,18 +10,70 @@ Includes:
 ## Installation
 
 ```sh
-# .npmrc — point @blorp-labs scope to GitHub Packages
-echo "@blorp-labs:registry=https://npm.pkg.github.com" >> .npmrc
-
 pnpm add @blorp-labs/piefed-api-client
 ```
 
 ## Usage
 
+### Basic
+
+```ts
+import { createClient } from '@blorp-labs/piefed-api-client';
+
+const client = createClient('https://piefed.social');
+const site = await client.getApiAlphaSite();
+```
+
+### With authentication
+
 ```ts
-import { getCommunity, GetCommunityParams } from '@blorp-labs/piefed-api-client';
+const client = createClient('https://piefed.social', {
+  headers: { Authorization: 'Bearer <token>' },
+});
+```
+
+### With default fetch options
+
+Any [`RequestInit`](https://developer.mozilla.org/en-US/docs/Web/API/RequestInit) option (except `body` and `method`) can be set as a default:
+
+```ts
+const client = createClient('https://piefed.social', {
+  cache: 'no-store',
+  headers: { Authorization: 'Bearer <token>' },
+});
+```
+
+Per-call options override the defaults; headers are merged.
 
-const community = await getCommunity({ id: 123 });
+### Multiple instances
+
+```ts
+const a = createClient('https://instance-a.com');
+const b = createClient('https://instance-b.com');
+```
+
+### Error handling
+
+Errors throw an `ApiError` with `.status` and `.data`:
+
+```ts
+import { createClient, ApiError } from '@blorp-labs/piefed-api-client';
+
+try {
+  const site = await client.getApiAlphaSite();
+} catch (e) {
+  if (e instanceof ApiError) {
+    console.error(e.status, e.data);
+  }
+}
+```
+
+### Zod schemas
+
+Zod schemas are exported from the `/zod` subpath:
+
+```ts
+import { getApiAlphaSiteQueryParams } from '@blorp-labs/piefed-api-client/zod';
 ```
 
 ## Development
@@ -37,8 +89,7 @@ pnpm build      # compile TypeScript → dist/
 
 ## Automation
 
-A GitHub Actions workflow runs daily and on `workflow_dispatch`. If the OpenAPI spec has changed, it:
-1. Regenerates `src/`
-2. Bumps the patch version
-3. Commits & tags the change
-4. Publishes to GitHub Packages
+A GitHub Actions workflow triggers on every push to `main`. It:
+1. Regenerates `src/` from the live OpenAPI spec
+2. Sets the version to `0.0.0-{commit-sha}`
+3. Builds and publishes to npm

package/dist/create-client.d.ts

@@ -44,22 +44,7 @@ declare const allFns: {
     getPostApiAlphaUploadImageUrl: () => string;
     postApiAlphaUploadImage: (imageUploadRequest: import("./schemas").ImageUploadRequest, options?: RequestInit) => Promise<import("./schemas").ImageUploadResponse>;
     getPostApiAlphaUploadCommunityImageUrl: () => string;
-    postApiAlphaUploadCommunityImage: (imageUploadRequest: import("./schemas").ImageUploadRequest /**
-     * Create a client bound to a specific PieFed instance.
-     *
-     * @example
-     * 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');
-     */, options?: RequestInit) => Promise<import("./schemas").ImageUploadResponse>;
+    postApiAlphaUploadCommunityImage: (imageUploadRequest: import("./schemas").ImageUploadRequest, options?: RequestInit) => Promise<import("./schemas").ImageUploadResponse>;
     getPostApiAlphaUploadUserImageUrl: () => string;
     postApiAlphaUploadUserImage: (imageUploadRequest: import("./schemas").ImageUploadRequest, options?: RequestInit) => Promise<import("./schemas").ImageUploadResponse>;
     getPostApiAlphaImageDeleteUrl: () => string;
@@ -93,7 +78,8 @@ declare const allFns: {
     getPostApiAlphaPrivateMessageReportUrl: () => string;
     postApiAlphaPrivateMessageReport: (reportPrivateMessageRequest: import("./schemas").ReportPrivateMessageRequest, options?: RequestInit) => Promise<import("./schemas").PrivateMessageResponse>;
     getGetApiAlphaPostListUrl: (params?: import("./schemas").GetApiAlphaPostListParams) => string;
-    getApiAlphaPostList: (params?: import("./schemas").GetApiAlphaPostListParams, options?: RequestInit) => Promise<import("./schemas").ListPostsResponse>;
+    getApiAlphaPostList: (// Two instances at the same time:
+    params?: import("./schemas").GetApiAlphaPostListParams, options?: RequestInit) => Promise<import("./schemas").ListPostsResponse>;
     getGetApiAlphaPostList2Url: (params?: import("./schemas").GetApiAlphaPostList2Params) => string;
     getApiAlphaPostList2: (params?: import("./schemas").GetApiAlphaPostList2Params, options?: RequestInit) => Promise<import("./schemas").ListPostsResponse>;
     getGetApiAlphaPostUrl: (params: import("./schemas").GetApiAlphaPostParams) => string;
@@ -217,7 +203,22 @@ declare const allFns: {
     getGetApiAlphaCommentLikeListUrl: (params: import("./schemas").GetApiAlphaCommentLikeListParams) => string;
     getApiAlphaCommentLikeList: (params: import("./schemas").GetApiAlphaCommentLikeListParams, options?: RequestInit) => Promise<import("./schemas").ListCommentLikesResponse>;
     getGetApiAlphaAdminRegistrationApplicationListUrl: (params?: import("./schemas").GetApiAlphaAdminRegistrationApplicationListParams) => string;
-    getApiAlphaAdminRegistrationApplicationList: (params?: import("./schemas").GetApiAlphaAdminRegistrationApplicationListParams, options?: RequestInit) => Promise<import("./schemas").GetRegistrationListResponse>;
+    getApiAlphaAdminRegistrationApplicationList: (params?: import("./schemas").GetApiAlphaAdminRegistrationApplicationListParams, options?: RequestInit /**
+     * Create a client bound to a specific PieFed instance.
+     *
+     * @example
+     * 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');
+     */) => Promise<import("./schemas").GetRegistrationListResponse>;
     getPutApiAlphaAdminRegistrationApplicationApproveUrl: () => string;
     putApiAlphaAdminRegistrationApplicationApprove: (registrationApproveRequest: import("./schemas").RegistrationApproveRequest, options?: RequestInit) => Promise<void>;
 };
@@ -225,7 +226,7 @@ type AsyncFn = (...args: any[]) => Promise<any>;
 type ApiFunctions = {
     [K in keyof typeof allFns as (typeof allFns)[K] extends AsyncFn ? K : never]: (typeof allFns)[K];
 };
-interface CreateClientOptions {
+interface CreateClientOptions extends Omit<RequestInit, 'body' | 'method'> {
     /** Default headers merged into every request (e.g. Authorization). */
     headers?: Record<string, string>;
 }

package/dist/create-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"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"}

package/dist/create-client.js

@@ -79,33 +79,23 @@ function createClient(baseUrl, options = {}) {
     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.length - 1;
         boundFns[key] = (...args) => {
-            // options is always the last argument; inject baseUrl and default headers into it
-            const last = args[args.length - 1];
-            const extra = {
-                baseUrl,
-                ...(options.headers ? { headers: options.headers } : {}),
+            // Pad args so options index is always reachable
+            while (args.length <= optionsIndex)
+                args.push(undefined);
+            const { headers: defaultHeaders, ...defaultInit } = options;
+            const extra = { ...defaultInit, baseUrl };
+            const existing = args[optionsIndex];
+            args[optionsIndex] = {
+                ...extra,
+                ...existing,
+                headers: {
+                    ...defaultHeaders,
+                    ...existing?.headers,
+                },
             };
-            if (last !== null && typeof last === 'object' && !Array.isArray(last)) {
-                const lastObj = last;
-                args[args.length - 1] = {
-                    ...extra,
-                    ...lastObj,
-                    // per-call headers win, but default headers fill in any gaps
-                    headers: { ...options.headers, ...lastObj.headers },
-                };
-            }
-            else if (last === undefined || args.length === 0) {
-                if (args.length > 0) {
-                    args[args.length - 1] = extra;
-                }
-                else {
-                    args.push(extra);
-                }
-            }
-            else {
-                args.push(extra);
-            }
             return fn(...args);
         };
     }

package/dist/create-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDA,oCAmCC;AAxFD,4DAA8C;AAC9C,kEAAoD;AACpD,wEAA0D;AAC1D,yDAA2C;AAC3C,yDAA2C;AAC3C,yDAA2C;AAC3C,yFAA2E;AAC3E,yDAA2C;AAC3C,4DAA8C;AAC9C,+DAAiD;AACjD,yDAA2C;AAE3C,MAAM,MAAM,GAAG;IACb,GAAG,KAAK;IACR,GAAG,OAAO;IACV,GAAG,SAAS;IACZ,GAAG,IAAI;IACP,GAAG,IAAI;IACP,GAAG,IAAI;IACP,GAAG,cAAc;IACjB,GAAG,IAAI;IACP,GAAG,KAAK;IACR,GAAG,MAAM;IACT,GAAG,IAAI;CACR,CAAC;AAaF;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,YAAY,CAAC,OAAe,EAAE,UAA+B,EAAE;IAC7E,MAAM,QAAQ,GAAG,EAA6B,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/C,IAAI,OAAO,EAAE,KAAK,UAAU;YAAE,SAAS;QAEvC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;YACrC,kFAAkF;YAClF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,KAAK,GAAsC;gBAC/C,OAAO;gBACP,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzD,CAAC;YACF,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtE,MAAM,OAAO,GAAG,IAA0C,CAAC;gBAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;oBACtB,GAAG,KAAK;oBACR,GAAG,OAAO;oBACV,6DAA6D;oBAC7D,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,GAAI,OAAO,CAAC,OAA8C,EAAE;iBAC5F,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpB,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;YACD,OAAQ,EAAc,CAAC,GAAG,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,QAAwB,CAAC;AAClC,CAAC"}
+{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDA,oCA+BC;AApFD,4DAA8C;AAC9C,kEAAoD;AACpD,wEAA0D;AAC1D,yDAA2C;AAC3C,yDAA2C;AAC3C,yDAA2C;AAC3C,yFAA2E;AAC3E,yDAA2C;AAC3C,4DAA8C;AAC9C,+DAAiD;AACjD,yDAA2C;AAE3C,MAAM,MAAM,GAAG;IACb,GAAG,KAAK;IACR,GAAG,OAAO;IACV,GAAG,SAAS;IACZ,GAAG,IAAI;IACP,GAAG,IAAI;IACP,GAAG,IAAI;IACP,GAAG,cAAc;IACjB,GAAG,IAAI;IACP,GAAG,KAAK;IACR,GAAG,MAAM;IACT,GAAG,IAAI;CACR,CAAC;AAaF;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,YAAY,CAAC,OAAe,EAAE,UAA+B,EAAE;IAC7E,MAAM,QAAQ,GAAG,EAA6B,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/C,IAAI,OAAO,EAAE,KAAK,UAAU;YAAE,SAAS;QAEvC,uEAAuE;QACvE,MAAM,YAAY,GAAI,EAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QAEhD,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;YACrC,gDAAgD;YAChD,OAAO,IAAI,CAAC,MAAM,IAAI,YAAY;gBAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEzD,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC;YAC5D,MAAM,KAAK,GAAsC,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,CAAC;YAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAqD,CAAC;YAExF,IAAI,CAAC,YAAY,CAAC,GAAG;gBACnB,GAAG,KAAK;gBACR,GAAG,QAAQ;gBACX,OAAO,EAAE;oBACP,GAAG,cAAc;oBACjB,GAAI,QAAQ,EAAE,OAA8C;iBAC7D;aACF,CAAC;YAEF,OAAQ,EAAc,CAAC,GAAG,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,QAAwB,CAAC;AAClC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blorp-labs/piefed-api-client",
-  "version": "0.0.0-0935c38",
+  "version": "0.0.0-774e8e8",
   "description": "Typed TypeScript client for the PieFed API, generated from the OpenAPI spec",
   "packageManager": "pnpm@10.6.5",
   "main": "./dist/index.js",

package/src/create-client.ts

@@ -30,7 +30,7 @@ type ApiFunctions = {
   [K in keyof typeof allFns as (typeof allFns)[K] extends AsyncFn ? K : never]: (typeof allFns)[K];
 };
 
-interface CreateClientOptions {
+interface CreateClientOptions extends Omit<RequestInit, 'body' | 'method'> {
   /** Default headers merged into every request (e.g. Authorization). */
   headers?: Record<string, string>;
 }
@@ -57,30 +57,26 @@ export function createClient(baseUrl: string, options: CreateClientOptions = {})
   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 and default headers into it
-      const last = args[args.length - 1];
-      const extra: RequestInit & { baseUrl: string } = {
-        baseUrl,
-        ...(options.headers ? { headers: options.headers } : {}),
+      // 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),
+        },
       };
-      if (last !== null && typeof last === 'object' && !Array.isArray(last)) {
-        const lastObj = last as RequestInit & { baseUrl?: string };
-        args[args.length - 1] = {
-          ...extra,
-          ...lastObj,
-          // per-call headers win, but default headers fill in any gaps
-          headers: { ...options.headers, ...(lastObj.headers as Record<string, string> | undefined) },
-        };
-      } else if (last === undefined || args.length === 0) {
-        if (args.length > 0) {
-          args[args.length - 1] = extra;
-        } else {
-          args.push(extra);
-        }
-      } else {
-        args.push(extra);
-      }
+
       return (fn as AsyncFn)(...args);
     };
   }