@bagelink/sdk 1.8.30 → 1.8.33

package/dist/index.cjs

@@ -655,20 +655,20 @@ function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr
             headers: { 'Content-Type': 'multipart/form-data' },
             onUploadProgress: options?.onUploadProgress${paramStr ? `, ${paramStr}` : ""}
         })
-        return new ApiResponse(response.data, response)`;
+        return ApiResponse.create(response.data, response)`;
     } else {
       axiosFunction += `
         const response = await axios.${method}(${formattedPath}, formData, {
             headers: { 'Content-Type': 'multipart/form-data' }${paramStr ? `, ${paramStr}` : ""}
         })
-        return new ApiResponse(response.data, response)`;
+        return ApiResponse.create(response.data, response)`;
     }
   } else {
     const configParams = paramStr ? `, { ${paramStr} }` : "";
     const bodyVar = requestBodyPayload || "{}";
     axiosFunction += `
         const response = await axios.${method}(${formattedPath}${["get", "delete"].includes(method) ? configParams : `, ${bodyVar}${configParams}`})
-        return new ApiResponse(response.data, response)`;
+        return ApiResponse.create(response.data, response)`;
   }
   axiosFunction += "}";
   return axiosFunction;
@@ -727,7 +727,8 @@ function generateFunctionForOperation(method, path, operation) {
   );
   const allParams = isFileUpload ? "file: File, options?: UploadOptions & { dirPath?: string, tags?: string[] }" : combineAllParams(parameters, requestBodyParam);
   const responseType = generateResponseType(operation.responses);
-  const responseTypeStr = responseType ? `: Promise<AxiosResponse<${responseType}>>` : "";
+  const isArrayResponse = responseType.endsWith("[]");
+  const responseTypeStr = responseType ? isArrayResponse ? `: Promise<ApiResponse<${responseType}>>` : `: Promise<${responseType} & { $raw?: any, $metadata?: any, totalCount?: number, page?: number, perPage?: number, totalPages?: number, rateLimit?: number, rateLimitReset?: number, getHeader?: (name: string) => string | undefined, hasPagination?: boolean, hasNextPage?: boolean, hasPrevPage?: boolean }>` : "";
   const functionComment = buildJSDocComment(operation, method, path);
   if (isStream) {
     const eventTypes = extractSSEEventTypes(operation);
@@ -1442,22 +1443,46 @@ class ApiResponse extends Array {
   /** All response metadata */
   $metadata;
   constructor(data, response) {
-    const items = Array.isArray(data) ? data : [data];
-    super(...items);
-    Object.setPrototypeOf(this, ApiResponse.prototype);
-    if (!response) {
-      return Object.setPrototypeOf([...items], Array.prototype);
-    }
-    this.$raw = response;
-    this.$metadata = this.parseMetadata(response);
-    this.totalCount = this.$metadata.totalCount;
-    this.page = this.$metadata.page;
-    this.perPage = this.$metadata.perPage;
-    this.totalPages = this.$metadata.totalPages;
-    this.rateLimit = this.$metadata.rateLimit;
-    this.rateLimitReset = this.$metadata.rateLimitReset;
-  }
-  parseMetadata(response) {
+    super();
+    if (Array.isArray(data)) {
+      this.push(...data);
+      if (response) {
+        this.$raw = response;
+        this.$metadata = ApiResponse.parseMetadataStatic(response);
+        this.totalCount = this.$metadata.totalCount;
+        this.page = this.$metadata.page;
+        this.perPage = this.$metadata.perPage;
+        this.totalPages = this.$metadata.totalPages;
+        this.rateLimit = this.$metadata.rateLimit;
+        this.rateLimitReset = this.$metadata.rateLimitReset;
+      }
+    }
+  }
+  /**
+   * Create an ApiResponse from data and response
+   * Factory method to handle both arrays and objects
+   */
+  static create(data, response) {
+    if (!Array.isArray(data)) {
+      const obj = Object.assign(/* @__PURE__ */ Object.create(null), data);
+      obj.$raw = response;
+      obj.$metadata = ApiResponse.parseMetadataStatic(response);
+      obj.totalCount = obj.$metadata.totalCount;
+      obj.page = obj.$metadata.page;
+      obj.perPage = obj.$metadata.perPage;
+      obj.totalPages = obj.$metadata.totalPages;
+      obj.rateLimit = obj.$metadata.rateLimit;
+      obj.rateLimitReset = obj.$metadata.rateLimitReset;
+      obj.getHeader = (name) => response?.headers[name.toLowerCase()];
+      obj.hasPagination = obj.totalCount !== void 0 || obj.page !== void 0;
+      obj.hasNextPage = obj.page && obj.totalPages ? obj.page < obj.totalPages : false;
+      obj.hasPrevPage = obj.page ? obj.page > 1 : false;
+      return obj;
+    }
+    const instance = new ApiResponse(data, response);
+    return instance;
+  }
+  static parseMetadataStatic(response) {
     const { headers } = response;
     const metadata = {};
     if (headers["x-total-count"]) {
@@ -1614,7 +1639,7 @@ function wrapApiForDirectReturn(apiObj) {
     return async (...args) => {
       const result = await apiObj(...args);
       if (result && typeof result === "object" && "data" in result && "status" in result) {
-        return new ApiResponse(result.data, result);
+        return ApiResponse.create(result.data, result);
       }
       return result;
     };

package/dist/index.d.cts

@@ -554,10 +554,12 @@ interface ResponseMetadata {
     [key: string]: any;
 }
 /**
- * Enhanced API response that acts as an array with metadata
- * @template TData - The data type (will be unwrapped if array)
+ * Enhanced API response that adds metadata to the response data
+ * - For arrays: acts as array with metadata properties
+ * - For objects: object with metadata properties (no array wrapping!)
+ * @template TData - The response data type
  */
-declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : TData> {
+declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : never> {
     /** Raw axios response */
     $raw: AxiosResponse<TData>;
     /** Total number of items (from x-total-count header) */
@@ -574,8 +576,13 @@ declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U
     rateLimitReset?: number;
     /** All response metadata */
     $metadata: ResponseMetadata;
-    constructor(data: TData, response?: AxiosResponse);
-    private parseMetadata;
+    private constructor();
+    /**
+     * Create an ApiResponse from data and response
+     * Factory method to handle both arrays and objects
+     */
+    static create<T>(data: T, response: AxiosResponse): any;
+    private static parseMetadataStatic;
     getHeader(name: string): string | undefined;
     get hasPagination(): boolean;
     get hasNextPage(): boolean;

package/dist/index.d.mts

@@ -554,10 +554,12 @@ interface ResponseMetadata {
     [key: string]: any;
 }
 /**
- * Enhanced API response that acts as an array with metadata
- * @template TData - The data type (will be unwrapped if array)
+ * Enhanced API response that adds metadata to the response data
+ * - For arrays: acts as array with metadata properties
+ * - For objects: object with metadata properties (no array wrapping!)
+ * @template TData - The response data type
  */
-declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : TData> {
+declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : never> {
     /** Raw axios response */
     $raw: AxiosResponse<TData>;
     /** Total number of items (from x-total-count header) */
@@ -574,8 +576,13 @@ declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U
     rateLimitReset?: number;
     /** All response metadata */
     $metadata: ResponseMetadata;
-    constructor(data: TData, response?: AxiosResponse);
-    private parseMetadata;
+    private constructor();
+    /**
+     * Create an ApiResponse from data and response
+     * Factory method to handle both arrays and objects
+     */
+    static create<T>(data: T, response: AxiosResponse): any;
+    private static parseMetadataStatic;
     getHeader(name: string): string | undefined;
     get hasPagination(): boolean;
     get hasNextPage(): boolean;

package/dist/index.d.ts

@@ -554,10 +554,12 @@ interface ResponseMetadata {
     [key: string]: any;
 }
 /**
- * Enhanced API response that acts as an array with metadata
- * @template TData - The data type (will be unwrapped if array)
+ * Enhanced API response that adds metadata to the response data
+ * - For arrays: acts as array with metadata properties
+ * - For objects: object with metadata properties (no array wrapping!)
+ * @template TData - The response data type
  */
-declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : TData> {
+declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : never> {
     /** Raw axios response */
     $raw: AxiosResponse<TData>;
     /** Total number of items (from x-total-count header) */
@@ -574,8 +576,13 @@ declare class ApiResponse<TData = any> extends Array<TData extends Array<infer U
     rateLimitReset?: number;
     /** All response metadata */
     $metadata: ResponseMetadata;
-    constructor(data: TData, response?: AxiosResponse);
-    private parseMetadata;
+    private constructor();
+    /**
+     * Create an ApiResponse from data and response
+     * Factory method to handle both arrays and objects
+     */
+    static create<T>(data: T, response: AxiosResponse): any;
+    private static parseMetadataStatic;
     getHeader(name: string): string | undefined;
     get hasPagination(): boolean;
     get hasNextPage(): boolean;

package/dist/index.mjs

@@ -649,20 +649,20 @@ function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr
             headers: { 'Content-Type': 'multipart/form-data' },
             onUploadProgress: options?.onUploadProgress${paramStr ? `, ${paramStr}` : ""}
         })
-        return new ApiResponse(response.data, response)`;
+        return ApiResponse.create(response.data, response)`;
     } else {
       axiosFunction += `
         const response = await axios.${method}(${formattedPath}, formData, {
             headers: { 'Content-Type': 'multipart/form-data' }${paramStr ? `, ${paramStr}` : ""}
         })
-        return new ApiResponse(response.data, response)`;
+        return ApiResponse.create(response.data, response)`;
     }
   } else {
     const configParams = paramStr ? `, { ${paramStr} }` : "";
     const bodyVar = requestBodyPayload || "{}";
     axiosFunction += `
         const response = await axios.${method}(${formattedPath}${["get", "delete"].includes(method) ? configParams : `, ${bodyVar}${configParams}`})
-        return new ApiResponse(response.data, response)`;
+        return ApiResponse.create(response.data, response)`;
   }
   axiosFunction += "}";
   return axiosFunction;
@@ -721,7 +721,8 @@ function generateFunctionForOperation(method, path, operation) {
   );
   const allParams = isFileUpload ? "file: File, options?: UploadOptions & { dirPath?: string, tags?: string[] }" : combineAllParams(parameters, requestBodyParam);
   const responseType = generateResponseType(operation.responses);
-  const responseTypeStr = responseType ? `: Promise<AxiosResponse<${responseType}>>` : "";
+  const isArrayResponse = responseType.endsWith("[]");
+  const responseTypeStr = responseType ? isArrayResponse ? `: Promise<ApiResponse<${responseType}>>` : `: Promise<${responseType} & { $raw?: any, $metadata?: any, totalCount?: number, page?: number, perPage?: number, totalPages?: number, rateLimit?: number, rateLimitReset?: number, getHeader?: (name: string) => string | undefined, hasPagination?: boolean, hasNextPage?: boolean, hasPrevPage?: boolean }>` : "";
   const functionComment = buildJSDocComment(operation, method, path);
   if (isStream) {
     const eventTypes = extractSSEEventTypes(operation);
@@ -1436,22 +1437,46 @@ class ApiResponse extends Array {
   /** All response metadata */
   $metadata;
   constructor(data, response) {
-    const items = Array.isArray(data) ? data : [data];
-    super(...items);
-    Object.setPrototypeOf(this, ApiResponse.prototype);
-    if (!response) {
-      return Object.setPrototypeOf([...items], Array.prototype);
-    }
-    this.$raw = response;
-    this.$metadata = this.parseMetadata(response);
-    this.totalCount = this.$metadata.totalCount;
-    this.page = this.$metadata.page;
-    this.perPage = this.$metadata.perPage;
-    this.totalPages = this.$metadata.totalPages;
-    this.rateLimit = this.$metadata.rateLimit;
-    this.rateLimitReset = this.$metadata.rateLimitReset;
-  }
-  parseMetadata(response) {
+    super();
+    if (Array.isArray(data)) {
+      this.push(...data);
+      if (response) {
+        this.$raw = response;
+        this.$metadata = ApiResponse.parseMetadataStatic(response);
+        this.totalCount = this.$metadata.totalCount;
+        this.page = this.$metadata.page;
+        this.perPage = this.$metadata.perPage;
+        this.totalPages = this.$metadata.totalPages;
+        this.rateLimit = this.$metadata.rateLimit;
+        this.rateLimitReset = this.$metadata.rateLimitReset;
+      }
+    }
+  }
+  /**
+   * Create an ApiResponse from data and response
+   * Factory method to handle both arrays and objects
+   */
+  static create(data, response) {
+    if (!Array.isArray(data)) {
+      const obj = Object.assign(/* @__PURE__ */ Object.create(null), data);
+      obj.$raw = response;
+      obj.$metadata = ApiResponse.parseMetadataStatic(response);
+      obj.totalCount = obj.$metadata.totalCount;
+      obj.page = obj.$metadata.page;
+      obj.perPage = obj.$metadata.perPage;
+      obj.totalPages = obj.$metadata.totalPages;
+      obj.rateLimit = obj.$metadata.rateLimit;
+      obj.rateLimitReset = obj.$metadata.rateLimitReset;
+      obj.getHeader = (name) => response?.headers[name.toLowerCase()];
+      obj.hasPagination = obj.totalCount !== void 0 || obj.page !== void 0;
+      obj.hasNextPage = obj.page && obj.totalPages ? obj.page < obj.totalPages : false;
+      obj.hasPrevPage = obj.page ? obj.page > 1 : false;
+      return obj;
+    }
+    const instance = new ApiResponse(data, response);
+    return instance;
+  }
+  static parseMetadataStatic(response) {
     const { headers } = response;
     const metadata = {};
     if (headers["x-total-count"]) {
@@ -1608,7 +1633,7 @@ function wrapApiForDirectReturn(apiObj) {
     return async (...args) => {
       const result = await apiObj(...args);
       if (result && typeof result === "object" && "data" in result && "status" in result) {
-        return new ApiResponse(result.data, result);
+        return ApiResponse.create(result.data, result);
       }
       return result;
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/sdk",
   "type": "module",
-  "version": "1.8.30",
+  "version": "1.8.33",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Bagel Studio",

package/src/index.ts

@@ -39,10 +39,12 @@ export interface ResponseMetadata {
 }
 
 /**
- * Enhanced API response that acts as an array with metadata
- * @template TData - The data type (will be unwrapped if array)
+ * Enhanced API response that adds metadata to the response data
+ * - For arrays: acts as array with metadata properties
+ * - For objects: object with metadata properties (no array wrapping!)
+ * @template TData - The response data type
  */
-export class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : TData> {
+export class ApiResponse<TData = any> extends Array<TData extends Array<infer U> ? U : never> {
 	/** Raw axios response */
 	public $raw!: AxiosResponse<TData>
 
@@ -67,29 +69,56 @@ export class ApiResponse<TData = any> extends Array<TData extends Array<infer U>
 	/** All response metadata */
 	public $metadata!: ResponseMetadata
 
-	constructor(data: TData, response?: AxiosResponse) {
-		const items = (Array.isArray(data) ? data : [data]) as Array<TData extends Array<infer U> ? U : TData>
-		super(...items)
-		Object.setPrototypeOf(this, ApiResponse.prototype)
-
-		// Handle case where constructor is called without response (from array methods)
-		if (!response) {
-			// Return a plain array when array methods call the constructor
-			return Object.setPrototypeOf([...items], Array.prototype) as any
+	private constructor(data: TData, response?: AxiosResponse) {
+		// Must call super first when extending Array
+		super()
+
+		// For arrays, add items and metadata
+		if (Array.isArray(data)) {
+			this.push(...data as any[])
+
+			if (response) {
+				this.$raw = response as AxiosResponse<TData>
+				this.$metadata = ApiResponse.parseMetadataStatic(response)
+				this.totalCount = this.$metadata.totalCount
+				this.page = this.$metadata.page
+				this.perPage = this.$metadata.perPage
+				this.totalPages = this.$metadata.totalPages
+				this.rateLimit = this.$metadata.rateLimit
+				this.rateLimitReset = this.$metadata.rateLimitReset
+			}
 		}
+	}
 
-		this.$raw = response as AxiosResponse<TData>
-		this.$metadata = this.parseMetadata(response)
+	/**
+	 * Create an ApiResponse from data and response
+	 * Factory method to handle both arrays and objects
+	 */
+	static create<T>(data: T, response: AxiosResponse): any {
+		// For single objects, attach metadata directly
+		if (!Array.isArray(data)) {
+			const obj = Object.assign(Object.create(null), data) as any
+			obj.$raw = response
+			obj.$metadata = ApiResponse.parseMetadataStatic(response)
+			obj.totalCount = obj.$metadata.totalCount
+			obj.page = obj.$metadata.page
+			obj.perPage = obj.$metadata.perPage
+			obj.totalPages = obj.$metadata.totalPages
+			obj.rateLimit = obj.$metadata.rateLimit
+			obj.rateLimitReset = obj.$metadata.rateLimitReset
+			obj.getHeader = (name: string) => response?.headers[name.toLowerCase()]
+			obj.hasPagination = obj.totalCount !== undefined || obj.page !== undefined
+			obj.hasNextPage = obj.page && obj.totalPages ? obj.page < obj.totalPages : false
+			obj.hasPrevPage = obj.page ? obj.page > 1 : false
+			return obj
+		}
 
-		this.totalCount = this.$metadata.totalCount
-		this.page = this.$metadata.page
-		this.perPage = this.$metadata.perPage
-		this.totalPages = this.$metadata.totalPages
-		this.rateLimit = this.$metadata.rateLimit
-		this.rateLimitReset = this.$metadata.rateLimitReset
+		// For arrays, create ApiResponse instance
+		const instance = new ApiResponse(data, response)
+		return instance
 	}
 
-	private parseMetadata(response: AxiosResponse): ResponseMetadata {
+	private static parseMetadataStatic(response: AxiosResponse): ResponseMetadata {
 		const { headers } = response
 		const metadata: ResponseMetadata = {}
 
@@ -365,7 +394,7 @@ export function wrapApiForDirectReturn(apiObj: any): any {
 		return async (...args: any[]) => {
 			const result = await apiObj(...args)
 			if (result && typeof result === 'object' && 'data' in result && 'status' in result) {
-				return new ApiResponse(result.data, result)
+				return ApiResponse.create(result.data, result)
 			}
 			return result
 		}

package/src/openAPITools/functionGenerator.ts

@@ -511,14 +511,14 @@ function generateAxiosFunction(
             headers: { 'Content-Type': 'multipart/form-data' },
             onUploadProgress: options?.onUploadProgress${paramStr ? `, ${paramStr}` : ''}
         })
-        return new ApiResponse(response.data, response)`
+        return ApiResponse.create(response.data, response)`
 		} else {
 			// Generic FormData handling
 			axiosFunction += `
         const response = await axios.${method}(${formattedPath}, formData, {
             headers: { 'Content-Type': 'multipart/form-data' }${paramStr ? `, ${paramStr}` : ''}
         })
-        return new ApiResponse(response.data, response)`
+        return ApiResponse.create(response.data, response)`
 		}
 	} else {
 		const configParams = paramStr ? `, { ${paramStr} }` : ''
@@ -529,7 +529,7 @@ function generateAxiosFunction(
 				? configParams
 				: `, ${bodyVar}${configParams}`
 		})
-        return new ApiResponse(response.data, response)`
+        return ApiResponse.create(response.data, response)`
 	}
 
 	axiosFunction += '}'
@@ -629,8 +629,16 @@ function generateFunctionForOperation(
 		: combineAllParams(parameters, requestBodyParam)
 
 	const responseType = generateResponseType(operation.responses)
+
+	// Determine if response is an array type
+	const isArrayResponse = responseType.endsWith('[]')
+
+	// For arrays: ApiResponse<T[]>
+	// For single objects: T & metadata (more permissive for assignment)
 	const responseTypeStr = responseType
-		? `: Promise<AxiosResponse<${responseType}>>`
+		? isArrayResponse
+			? `: Promise<ApiResponse<${responseType}>>`
+			: `: Promise<${responseType} & { $raw?: any, $metadata?: any, totalCount?: number, page?: number, perPage?: number, totalPages?: number, rateLimit?: number, rateLimitReset?: number, getHeader?: (name: string) => string | undefined, hasPagination?: boolean, hasNextPage?: boolean, hasPrevPage?: boolean }>`
 		: ''
 
 	// Create JSDoc comment with OpenAPI documentation