@blimu/client 1.1.0 → 1.1.3

package/dist/index.mjs

@@ -242,7 +242,7 @@ var HookRegistry = class {
     if (!this.hooks.has(stage)) {
       this.hooks.set(stage, []);
     }
-    this.hooks.get(stage).push(hook);
+    this.hooks.get(stage)?.push(hook);
   }
   /**
   * Remove a specific hook from a stage
@@ -288,7 +288,14 @@ var HookRegistry = class {
   * Check if any hooks are registered for a stage
   */
   has(stage) {
-    return this.hooks.has(stage) && this.hooks.get(stage).length > 0;
+    if (!this.hooks.has(stage)) {
+      return false;
+    }
+    const hooks = this.hooks.get(stage);
+    if (!hooks) {
+      return false;
+    }
+    return hooks.length > 0;
   }
 };
 var exponentialStrategy = /* @__PURE__ */ __name((attempt, baseBackoffMs) => {
@@ -403,7 +410,7 @@ async function* parseNDJSONStream(response) {
         try {
           const parsed = JSON.parse(trimmed);
           yield parsed;
-        } catch (error) {
+        } catch {
           console.warn("Skipping invalid JSON line:", trimmed);
         }
       }
@@ -412,7 +419,7 @@ async function* parseNDJSONStream(response) {
       try {
         const parsed = JSON.parse(buffer.trim());
         yield parsed;
-      } catch (error) {
+      } catch {
         console.warn("Skipping invalid JSON in buffer:", buffer.trim());
       }
     }
@@ -617,19 +624,17 @@ var FetchClient = class {
   * Add an authentication strategy
   */
   addAuthStrategy(strategy) {
-    if (!this.cfg.auth) {
-      this.cfg.auth = {
-        strategies: []
-      };
+    if (!this.cfg.authStrategies) {
+      this.cfg.authStrategies = [];
     }
-    this.cfg.auth.strategies.push(strategy);
+    this.cfg.authStrategies.push(strategy);
   }
   /**
   * Remove all authentication strategies
   */
   clearAuthStrategies() {
-    if (this.cfg.auth) {
-      this.cfg.auth.strategies = [];
+    if (this.cfg.authStrategies) {
+      this.cfg.authStrategies = [];
     }
   }
   /**
@@ -653,8 +658,9 @@ var FetchClient = class {
   /**
   * Make an HTTP request
   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async request(init) {
-    let url = buildUrl(this.cfg.baseURL || "", init.path, init.query);
+    const url = buildUrl(this.cfg.baseURL || "", init.path, init.query);
     const headers = new Headers(this.cfg.headers || {});
     if (init.headers) {
       if (init.headers instanceof Headers) {
@@ -691,7 +697,7 @@ var FetchClient = class {
     let lastError;
     for (let attempt = 0; attempt <= retries + 1; attempt++) {
       try {
-        let attemptUrl = buildUrl(this.cfg.baseURL || "", init.path, init.query);
+        const attemptUrl = buildUrl(this.cfg.baseURL || "", init.path, init.query);
         const attemptHeaders = new Headers(headers);
         await this.applyAuthentication(attemptHeaders, attemptUrl);
         return await this.doRequest(attemptUrl, init, attemptHeaders, attempt, bodyContentType);
@@ -700,11 +706,13 @@ var FetchClient = class {
         const shouldRetry = this.shouldRetry(err, attempt, retries, retryOn);
         if (shouldRetry) {
           if (this.hookRegistry.has("beforeRetry")) {
+            const serializedBody = serializeBody(init.body, bodyContentType);
             await this.hookRegistry.execute("beforeRetry", {
               url: url.toString(),
               init: {
                 ...init,
-                headers
+                headers,
+                body: serializedBody
               },
               attempt,
               error: err,
@@ -714,11 +722,13 @@ var FetchClient = class {
           const delay = calculateRetryDelay(attempt, retryStrategy, baseBackoff);
           await new Promise((resolve) => setTimeout(resolve, delay));
           if (this.hookRegistry.has("afterRetry")) {
+            const serializedBody = serializeBody(init.body, bodyContentType);
             await this.hookRegistry.execute("afterRetry", {
               url: url.toString(),
               init: {
                 ...init,
-                headers
+                headers,
+                body: serializedBody
               },
               attempt,
               error: err,
@@ -737,7 +747,7 @@ var FetchClient = class {
   * Make a streaming HTTP request
   */
   async *requestStream(init) {
-    let url = buildUrl(this.cfg.baseURL || "", init.path, init.query);
+    const url = buildUrl(this.cfg.baseURL || "", init.path, init.query);
     const headers = new Headers(this.cfg.headers || {});
     if (init.headers) {
       if (init.headers instanceof Headers) {
@@ -811,7 +821,8 @@ var FetchClient = class {
       }
       if (!res.ok) {
         const parsed = await parseResponse(res);
-        const error = createFetchError(res.status, parsed?.message || `HTTP ${res.status}`, parsed, res.headers);
+        const message = parsed?.message;
+        const error = createFetchError(res.status, message || `HTTP ${res.status}`, parsed, res.headers);
         if (this.hookRegistry.has("onError")) {
           await this.hookRegistry.execute("onError", {
             url: url.toString(),
@@ -833,7 +844,7 @@ var FetchClient = class {
       const streamingFormat = init.streamingFormat || "chunked";
       if (streamingFormat === "sse") {
         for await (const chunk of parseSSEStream(res)) {
-          let transformedChunk = chunk;
+          const transformedChunk = chunk;
           if (this.hookRegistry.has("onStreamChunk")) {
             await this.hookRegistry.execute("onStreamChunk", {
               url: url.toString(),
@@ -846,7 +857,7 @@ var FetchClient = class {
         }
       } else if (streamingFormat === "ndjson") {
         for await (const chunk of parseNDJSONStream(res)) {
-          let transformedChunk = chunk;
+          const transformedChunk = chunk;
           if (this.hookRegistry.has("onStreamChunk")) {
             await this.hookRegistry.execute("onStreamChunk", {
               url: url.toString(),
@@ -859,7 +870,7 @@ var FetchClient = class {
         }
       } else {
         for await (const chunk of parseChunkedStream(res)) {
-          let transformedChunk = chunk;
+          const transformedChunk = chunk;
           if (this.hookRegistry.has("onStreamChunk")) {
             await this.hookRegistry.execute("onStreamChunk", {
               url: url.toString(),
@@ -964,7 +975,8 @@ var FetchClient = class {
         });
       }
       if (!isSuccessResponse(res)) {
-        const error = createFetchError(res.status, parsed?.message || `HTTP ${res.status}`, parsed, res.headers);
+        const message = parsed?.message;
+        const error = createFetchError(res.status, message || `HTTP ${res.status}`, parsed, res.headers);
         if (this.hookRegistry.has("onError")) {
           await this.hookRegistry.execute("onError", {
             url: url.toString(),
@@ -1007,10 +1019,10 @@ var FetchClient = class {
   * Apply authentication strategies
   */
   async applyAuthentication(headers, url) {
-    if (!this.cfg.auth?.strategies) {
+    if (!this.cfg.authStrategies) {
       return;
     }
-    for (const strategy of this.cfg.auth.strategies) {
+    for (const strategy of this.cfg.authStrategies) {
       await this.applyAuthStrategy(strategy, headers, url);
     }
   }
@@ -1071,50 +1083,46 @@ var FetchClient = class {
   }
 };
 
-// src/client.ts
-var CoreClient = class extends FetchClient {
-  constructor(cfg = {}) {
-    const authStrategies = [];
-    const { auth: _existingAuth, bearer, ...restCfg } = cfg;
-    if (cfg.bearer) {
-      const bearerValue = cfg.bearer;
-      if (typeof bearerValue === "string") {
-        authStrategies.push({
-          type: "bearer",
-          token: () => bearerValue
-        });
-      } else if (typeof bearerValue === "function") {
-        authStrategies.push({
-          type: "bearer",
-          token: bearerValue
-        });
-      }
-    }
-    const finalAuthStrategies = [
-      ..._existingAuth?.strategies || [],
-      ...authStrategies
-    ];
-    const fetchConfig = {
-      ...restCfg,
-      baseURL: cfg.baseURL ?? "https://api.blimu.dev",
-      // Explicitly set auth after restCfg to ensure it's not overwritten
-      // (restCfg might have an auth property that we want to replace)
-      ...finalAuthStrategies.length > 0 ? {
-        auth: {
-          strategies: finalAuthStrategies
-        }
-      } : {}
-      // Hooks are passed through directly from FetchClientConfig (no mapping needed)
-    };
-    super(fetchConfig);
-  }
-  async request(init) {
-    return await super.request(init);
+// src/auth-strategies.ts
+function buildAuthStrategies(cfg) {
+  const authStrategies = [...cfg?.authStrategies ?? []];
+  if (cfg.bearer) {
+    authStrategies.push({
+      type: "bearer",
+      token: cfg.bearer
+    });
   }
-  async *requestStream(init) {
-    yield* super.requestStream(init);
+  return authStrategies;
+}
+
+// src/schema.ts
+var schema_exports = {};
+
+// src/utils.ts
+async function* paginate(fetchPage, initialQuery = {}, pageSize = 100) {
+  let offset = Number(initialQuery.offset ?? 0);
+  const limit = Number(initialQuery.limit ?? pageSize);
+  const baseQuery = { ...initialQuery };
+  while (true) {
+    const page = await fetchPage({ ...baseQuery, limit, offset });
+    const items = page.data ?? [];
+    for (const item of items) {
+      yield item;
+    }
+    if (!page.hasMore || items.length < limit) break;
+    offset += limit;
   }
-};
+}
+async function listAll(fetchPage, query = {}, pageSize = 100) {
+  const out = [];
+  for await (const item of paginate(fetchPage, query, pageSize)) out.push(item);
+  return out;
+}
+function isNotUndefined(arr) {
+  return arr.filter(
+    (item) => item !== void 0
+  );
+}
 
 // src/services/auth.ts
 var AuthService = class {
@@ -1128,7 +1136,7 @@ var AuthService = class {
     return this.core.request({
       method: "POST",
       path: `/v1/auth/logout`,
-      ...init || {}
+      ...init ?? {}
     });
   }
   /**
@@ -1146,7 +1154,7 @@ var AuthService = class {
       method: "POST",
       path: `/v1/auth/refresh`,
       query,
-      ...init || {}
+      ...init ?? {}
     });
   }
   /**
@@ -1154,7 +1162,8 @@ var AuthService = class {
    * @returns ['v1/auth/refresh', query]
    */
   refresh__queryKeys(query) {
-    return ["v1/auth/refresh", query];
+    const keys = ["v1/auth/refresh", query];
+    return isNotUndefined(keys);
   }
   /**
    * GET /v1/auth/session*
@@ -1163,7 +1172,7 @@ var AuthService = class {
     return this.core.request({
       method: "GET",
       path: `/v1/auth/session`,
-      ...init || {}
+      ...init ?? {}
     });
   }
   /**
@@ -1188,7 +1197,7 @@ var EntitlementsService = class {
     return this.core.request({
       method: "GET",
       path: `/v1/client/entitlements/list-for-tenant/${encodeURIComponent(tenantResourceId)}`,
-      ...init || {}
+      ...init ?? {}
     });
   }
   /**
@@ -1196,70 +1205,53 @@ var EntitlementsService = class {
    * @returns ['v1/client/entitlements/list-for-tenant', tenantResourceId]
    */
   listForTenant__queryKeys(tenantResourceId) {
-    return [
-      "v1/client/entitlements/list-for-tenant",
-      tenantResourceId
-    ];
+    return ["v1/client/entitlements/list-for-tenant", tenantResourceId];
   }
 };
 
-// src/utils.ts
-async function* paginate(fetchPage, initialQuery = {}, pageSize = 100) {
-  let offset = Number(initialQuery.offset ?? 0);
-  const limit = Number(initialQuery.limit ?? pageSize);
-  const baseQuery = { ...initialQuery };
-  while (true) {
-    const page = await fetchPage({ ...baseQuery, limit, offset });
-    const items = page.data ?? [];
-    for (const item of items) {
-      yield item;
-    }
-    if (!page.hasMore || items.length < limit) break;
-    offset += limit;
+// src/client.ts
+var Blimu = class {
+  auth;
+  entitlements;
+  constructor(options) {
+    const restCfg = { ...options ?? {} };
+    delete restCfg.bearer;
+    const authStrategies = buildAuthStrategies(options ?? {});
+    const core = new FetchClient({
+      ...restCfg,
+      baseURL: options?.baseURL ?? "https://api.blimu.dev",
+      ...authStrategies.length > 0 ? { authStrategies } : {}
+    });
+    this.auth = new AuthService(core);
+    this.entitlements = new EntitlementsService(core);
   }
-}
-async function listAll(fetchPage, query = {}, pageSize = 100) {
-  const out = [];
-  for await (const item of paginate(fetchPage, query, pageSize))
-    out.push(item);
-  return out;
-}
-
-// src/schema.ts
-var schema_exports = {};
+};
+var BlimuError = FetchError;
 
 // src/schema.zod.ts
 var schema_zod_exports = {};
 __export(schema_zod_exports, {
   AuthRefreshQuerySchema: () => AuthRefreshQuerySchema,
-  EntitlementTypeSchema: () => EntitlementTypeSchema,
   EntitlementsListResultSchema: () => EntitlementsListResultSchema,
   RefreshResponseSchema: () => RefreshResponseSchema,
-  ResourceTypeSchema: () => ResourceTypeSchema,
   SessionResponseSchema: () => SessionResponseSchema
 });
 import { z } from "zod";
-var EntitlementTypeSchema = z.string();
-var ResourceTypeSchema = z.string();
 var EntitlementsListResultSchema = z.object({
-  results: z.array(
-    z.object({
-      entitlements: z.array(
-        z.object({
-          allowed: z.boolean(),
-          allowedByPlan: z.boolean(),
-          allowedByRole: z.boolean(),
-          allowedPlans: z.array(z.string()).optional(),
-          allowedRoles: z.array(z.string()),
-          currentPlan: z.string().optional(),
-          currentRole: z.string().optional(),
-          entitlement: EntitlementTypeSchema
-        })
-      ),
-      resourceId: z.string(),
-      resourceType: ResourceTypeSchema
-    })
-  )
+  results: z.object({
+    entitlements: z.object({
+      allowed: z.boolean(),
+      allowedByPlan: z.boolean(),
+      allowedByRole: z.boolean(),
+      allowedPlans: z.string().array().optional(),
+      allowedRoles: z.string().array(),
+      currentPlan: z.string().optional(),
+      currentRole: z.string().optional(),
+      entitlement: z.string()
+    }).array(),
+    resourceId: z.string(),
+    resourceType: z.string()
+  }).array()
 });
 var RefreshResponseSchema = z.object({ sessionToken: z.string() });
 var SessionResponseSchema = z.object({
@@ -1275,16 +1267,6 @@ var SessionResponseSchema = z.object({
 var AuthRefreshQuerySchema = z.object({
   __lh_jwt: z.string().optional()
 });
-
-// src/index.ts
-var Blimu = class {
-  constructor(options) {
-    const core = new CoreClient(options);
-    this.auth = new AuthService(core);
-    this.entitlements = new EntitlementsService(core);
-  }
-};
-var BlimuError = FetchError;
 export {
   AuthService,
   BadGatewayError,
@@ -1293,7 +1275,6 @@ export {
   BlimuError,
   ClientError,
   ConflictError,
-  CoreClient,
   EntitlementsService,
   FetchClient,
   FetchError,
@@ -1322,6 +1303,7 @@ export {
   isBrowser,
   isFetchAvailable,
   isNode,
+  isNotUndefined,
   isSuccessResponse,
   linearStrategy,
   listAll,