@devpad/api 1.0.1 → 2.0.0

package/dist/request.js

@@ -4,15 +4,19 @@ import { ApiError, AuthenticationError } from "./errors";
 export class ApiClient {
     constructor(options) {
         this.category = "api";
-        if (!options.api_key) {
-            throw new Error("API key is required");
-        }
-        if (options.api_key.length < 10) {
-            throw new Error("API key is too short");
+        this.auth_mode = options.auth_mode ?? (options.api_key?.startsWith("jwt:") ? "session" : "key");
+        if (this.auth_mode !== "cookie") {
+            if (!options.api_key)
+                throw new Error("API key is required");
+            if (options.api_key.length < 10)
+                throw new Error("API key is too short");
         }
         this.base_url = options.base_url;
-        this.api_key = options.api_key;
+        this.api_key = options.api_key ?? "";
         this.category = options.category || "api";
+        this.credentials = options.credentials;
+        this.default_headers = options.default_headers ?? {};
+        this.custom_fetch = options.custom_fetch;
         this.request_history = new ArrayBufferedQueue(options.max_history_size ?? 5);
     }
     buildUrl(path, query) {
@@ -41,10 +45,16 @@ export class ApiClient {
         });
         const request_headers = {
             "Content-Type": "application/json",
-            Authorization: `Bearer ${this.api_key}`,
             "X-Request-ID": requestId,
+            ...this.default_headers,
             ...headers,
         };
+        if (this.auth_mode === "session") {
+            request_headers.Authorization = `Bearer jwt:${this.api_key.replace(/^jwt:/, "")}`;
+        }
+        else if (this.auth_mode === "key") {
+            request_headers.Authorization = `Bearer ${this.api_key}`;
+        }
         // Initialize history entry
         const historyEntry = {
             timestamp,
@@ -61,7 +71,14 @@ export class ApiClient {
             if (body) {
                 fetchOptions.body = JSON.stringify(body);
             }
-            const response = await fetch(url, fetchOptions);
+            if (this.credentials) {
+                fetchOptions.credentials = this.credentials;
+            }
+            else if (this.auth_mode === "cookie") {
+                fetchOptions.credentials = "include";
+            }
+            const fetcher = this.custom_fetch ?? fetch;
+            const response = await fetcher(url, fetchOptions);
             const duration = Date.now() - startTime;
             // Update history entry with response info
             historyEntry.status = response.status;
@@ -117,6 +134,7 @@ export class ApiClient {
         catch (error) {
             const duration = Date.now() - startTime;
             console.log(`[ERROR][${this.category}] ${method} ${path} [${requestId}] failed`, {
+                url,
                 duration: `${duration}ms`,
                 error: error instanceof Error ? error.message : String(error),
                 body,
@@ -161,16 +179,13 @@ export class ApiClient {
         return this.base_url;
     }
     headers() {
-        const isJWT = this.api_key.startsWith("jwt:");
         const headers = {
             "Content-Type": "application/json",
         };
-        if (isJWT) {
-            // JWT token in Authorization header
-            headers.Authorization = `Bearer ${this.api_key.replace("jwt:", "")}`;
+        if (this.auth_mode === "session") {
+            headers.Authorization = `Bearer jwt:${this.api_key.replace(/^jwt:/, "")}`;
         }
-        else {
-            // API key in X-API-KEY header
+        else if (this.auth_mode === "key") {
             headers["X-API-KEY"] = this.api_key;
         }
         return headers;

package/dist/result.d.ts

@@ -1,42 +1,10 @@
-/**
- * Result type system for clean error handling in API operations
- * Provides type-safe success/failure patterns with context-aware property names
- */
-export type Success<TData, TName extends string> = {
-    [K in TName]: TData;
-} & {
-    error: null;
+import { err, ok, type Result } from "@f0rbit/corpus";
+export type ApiResultError = {
+    message: string;
+    code?: string;
+    status_code?: number;
 };
-export type Failure<TName extends string> = {
-    [K in TName]: null;
-} & {
-    error: {
-        message: string;
-        code?: string;
-        status_code?: number;
-    };
-};
-export type Result<TData, TName extends string> = Success<TData, TName> | Failure<TName>;
-/**
- * Wraps any async function with Result type for clean error handling
- * Automatically generates context-aware property names
- *
- * @param fn - The async function to wrap
- * @param data_name - The property name for the data in the result
- * @returns Promise that resolves to Result type with success/error pattern
- *
- * @example
- * ```typescript
- * const getProject = (id: string) =>
- *   wrap(() => client.projects.find(id), 'project');
- *
- * const { project, error } = await getProject('123');
- * if (error) {
- *   console.error(error.message);
- *   return;
- * }
- * // project is guaranteed to be non-null here
- * ```
- */
-export declare function wrap<TData, TName extends string>(fn: () => Promise<TData>, data_name: TName): Promise<Result<TData, TName>>;
+export type ApiResult<T> = Result<T, ApiResultError>;
+export declare function wrap<T>(fn: () => Promise<T>): Promise<ApiResult<T>>;
+export { ok, err, type Result };
 //# sourceMappingURL=result.d.ts.map

package/dist/result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,MAAM,MAAM,OAAO,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,IAAI;KACjD,CAAC,IAAI,KAAK,GAAG,KAAK;CACnB,GAAG;IACH,KAAK,EAAE,IAAI,CAAC;CACZ,CAAC;AAGF,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,MAAM,IAAI;KAC1C,CAAC,IAAI,KAAK,GAAG,IAAI;CAClB,GAAG;IACH,KAAK,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACF,CAAC;AAGF,MAAM,MAAM,MAAM,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEzF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAkB3H"}
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;AAErD,wBAAgB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAUnE;AAED,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC"}

package/dist/result.js

@@ -1,44 +1,11 @@
-/**
- * Result type system for clean error handling in API operations
- * Provides type-safe success/failure patterns with context-aware property names
- */
-/**
- * Wraps any async function with Result type for clean error handling
- * Automatically generates context-aware property names
- *
- * @param fn - The async function to wrap
- * @param data_name - The property name for the data in the result
- * @returns Promise that resolves to Result type with success/error pattern
- *
- * @example
- * ```typescript
- * const getProject = (id: string) =>
- *   wrap(() => client.projects.find(id), 'project');
- *
- * const { project, error } = await getProject('123');
- * if (error) {
- *   console.error(error.message);
- *   return;
- * }
- * // project is guaranteed to be non-null here
- * ```
- */
-export function wrap(fn, data_name) {
+import { err, ok } from "@f0rbit/corpus";
+export function wrap(fn) {
     return fn()
-        .then(data => {
-        const result = { error: null };
-        result[data_name] = data;
-        return result;
-    })
-        .catch(error => {
-        const result = {
-            error: {
-                message: error.message || `Failed to fetch ${data_name}`,
-                code: error.code,
-                status_code: error.statusCode || error.status_code,
-            },
-        };
-        result[data_name] = null;
-        return result;
-    });
+        .then(data => ok(data))
+        .catch(error => err({
+        message: error.message || "Unknown error",
+        code: error.code,
+        status_code: error.statusCode || error.status_code,
+    }));
 }
+export { ok, err };

package/dist/tools.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { ApiClient } from "./api-client";
+import type { ApiClient } from "./api-client";
 export declare const project_filters: z.ZodObject<{
     private: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
@@ -11,17 +11,17 @@ export declare const project_by_id_or_name: z.ZodEffects<z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    id?: string | undefined;
     name?: string | undefined;
-}, {
     id?: string | undefined;
+}, {
     name?: string | undefined;
-}>, {
     id?: string | undefined;
+}>, {
     name?: string | undefined;
-}, {
     id?: string | undefined;
+}, {
     name?: string | undefined;
+    id?: string | undefined;
 }>;
 export declare const task_filters: z.ZodObject<{
     project_id: z.ZodOptional<z.ZodString>;

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;EAO/B,CAAC;AAEJ,eAAO,MAAM,YAAY;;;;;;;;;EAGvB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;EAErB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;EAE5B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;EAErB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;EAG1B,CAAC;AAGH,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE;AAGD,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAsXhD,CAAC;AAGF,wBAAgB,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qCAIpD;AAGD,eAAO,MAAM,SAAS,UAAqB,CAAC;AAG5C,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAEhE"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQ9C,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;EAO/B,CAAC;AAEJ,eAAO,MAAM,YAAY;;;;;;;;;EAGvB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;EAErB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;EAE5B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;EAErB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;EAG1B,CAAC;AAGH,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE;AAGD,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAsdhD,CAAC;AAGF,wBAAgB,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qCAIpD;AAGD,eAAO,MAAM,SAAS,UAAqB,CAAC;AAG5C,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAEhE"}