@bagelink/sdk 1.8.35 → 1.8.37

package/dist/index.cjs

@@ -421,28 +421,35 @@ function schemaToTypeWithCollection(schema) {
 }
 function getResponseType(response) {
   if (isReferenceObject(response)) {
-    return void 0;
+    return { type: void 0, isArray: false };
   }
   const mediaTypeObject = response.content?.["application/json"];
   if (!mediaTypeObject?.schema) {
-    return void 0;
+    return { type: void 0, isArray: false };
   }
-  return schemaToTypeWithCollection(mediaTypeObject.schema);
+  const schema = dereference(mediaTypeObject.schema);
+  const typeString = schemaToTypeWithCollection(schema);
+  const isArray = schema?.type === "array" || typeString?.endsWith("[]") || false;
+  return { type: typeString, isArray };
 }
 function generateResponseType(responses) {
   if (!responses) {
-    return "";
+    return { type: "", isArray: false };
   }
   const types = [];
+  let isArrayResponse = false;
   for (const [statusCode, response] of Object.entries(responses)) {
     if (statusCode.startsWith("2")) {
-      const responseType = getResponseType(response);
+      const { type: responseType, isArray } = getResponseType(response);
       if (responseType && responseType !== "any") {
         types.push(responseType);
+        if (isArray) {
+          isArrayResponse = true;
+        }
       }
     }
   }
-  return types.join(" | ");
+  return { type: types.join(" | "), isArray: isArrayResponse };
 }
 function getParamsFromPath(path) {
   const pathParamRegex = /\{[^}]+\}/g;
@@ -726,8 +733,8 @@ function generateFunctionForOperation(method, path, operation) {
     operation.requestBody
   );
   const allParams = isFileUpload ? "file: File, options?: UploadOptions & { dirPath?: string, tags?: string[] }" : combineAllParams(parameters, requestBodyParam);
-  const responseType = generateResponseType(operation.responses);
-  const responseTypeStr = responseType ? `: Promise<ApiResponse<${responseType}>>` : "";
+  const { type: responseType, isArray: isArrayResponse } = generateResponseType(operation.responses);
+  const responseTypeStr = responseType ? isArrayResponse ? `: Promise<ApiResponse<${responseType}>>` : `: Promise<${responseType}>` : "";
   const functionComment = buildJSDocComment(operation, method, path);
   if (isStream) {
     const eventTypes = extractSSEEventTypes(operation);

package/dist/index.mjs

@@ -415,28 +415,35 @@ function schemaToTypeWithCollection(schema) {
 }
 function getResponseType(response) {
   if (isReferenceObject(response)) {
-    return void 0;
+    return { type: void 0, isArray: false };
   }
   const mediaTypeObject = response.content?.["application/json"];
   if (!mediaTypeObject?.schema) {
-    return void 0;
+    return { type: void 0, isArray: false };
   }
-  return schemaToTypeWithCollection(mediaTypeObject.schema);
+  const schema = dereference(mediaTypeObject.schema);
+  const typeString = schemaToTypeWithCollection(schema);
+  const isArray = schema?.type === "array" || typeString?.endsWith("[]") || false;
+  return { type: typeString, isArray };
 }
 function generateResponseType(responses) {
   if (!responses) {
-    return "";
+    return { type: "", isArray: false };
   }
   const types = [];
+  let isArrayResponse = false;
   for (const [statusCode, response] of Object.entries(responses)) {
     if (statusCode.startsWith("2")) {
-      const responseType = getResponseType(response);
+      const { type: responseType, isArray } = getResponseType(response);
       if (responseType && responseType !== "any") {
         types.push(responseType);
+        if (isArray) {
+          isArrayResponse = true;
+        }
       }
     }
   }
-  return types.join(" | ");
+  return { type: types.join(" | "), isArray: isArrayResponse };
 }
 function getParamsFromPath(path) {
   const pathParamRegex = /\{[^}]+\}/g;
@@ -720,8 +727,8 @@ function generateFunctionForOperation(method, path, operation) {
     operation.requestBody
   );
   const allParams = isFileUpload ? "file: File, options?: UploadOptions & { dirPath?: string, tags?: string[] }" : combineAllParams(parameters, requestBodyParam);
-  const responseType = generateResponseType(operation.responses);
-  const responseTypeStr = responseType ? `: Promise<ApiResponse<${responseType}>>` : "";
+  const { type: responseType, isArray: isArrayResponse } = generateResponseType(operation.responses);
+  const responseTypeStr = responseType ? isArrayResponse ? `: Promise<ApiResponse<${responseType}>>` : `: Promise<${responseType}>` : "";
   const functionComment = buildJSDocComment(operation, method, path);
   if (isStream) {
     const eventTypes = extractSSEEventTypes(operation);

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -101,36 +101,49 @@ function schemaToTypeWithCollection(schema?: OpenAPISchema | SchemaObject): stri
 /**
  * Extracts the response type from an OpenAPI response object
  * @param response - The OpenAPI response object
- * @returns The TypeScript type string or undefined
+ * @returns Object with type string and whether it's an array
  */
-function getResponseType(response: OpenAPIResponse | ReferenceObject): string | undefined {
+function getResponseType(response: OpenAPIResponse | ReferenceObject): { type: string | undefined, isArray: boolean } {
 	if (isReferenceObject(response)) {
-		return undefined // TODO: handle references properly
+		return { type: undefined, isArray: false }
 	}
 	const mediaTypeObject = response.content?.['application/json']
-	if (!mediaTypeObject?.schema) { return undefined }
-	return schemaToTypeWithCollection(mediaTypeObject.schema)
+	if (!mediaTypeObject?.schema) { return { type: undefined, isArray: false } }
+
+	const schema = dereference(mediaTypeObject.schema)
+	const typeString = schemaToTypeWithCollection(schema)
+
+	// Check if schema is an array type
+	const isArray = schema?.type === 'array' || typeString?.endsWith('[]') || false
+
+	return { type: typeString, isArray }
 }
 
 /**
  * Generates the response type string from OpenAPI responses
  * @param responses - The OpenAPI responses object
- * @returns The TypeScript response type string
+ * @returns Object with type string and array detection
  */
-function generateResponseType(responses?: OpenAPIResponses): string {
-	if (!responses) { return '' }
+function generateResponseType(responses?: OpenAPIResponses): { type: string, isArray: boolean } {
+	if (!responses) { return { type: '', isArray: false } }
 
 	const types: string[] = []
+	let isArrayResponse = false
+
 	for (const [statusCode, response] of Object.entries(responses)) {
 		if (statusCode.startsWith('2')) {
-			const responseType = getResponseType(response)
+			const { type: responseType, isArray } = getResponseType(response)
 			if (responseType && responseType !== 'any') {
 				types.push(responseType)
+				// If any successful response is an array, mark as array
+				if (isArray) {
+					isArrayResponse = true
+				}
 			}
 		}
 	}
 
-	return types.join(' | ')
+	return { type: types.join(' | '), isArray: isArrayResponse }
 }
 
 /**
@@ -628,12 +641,15 @@ function generateFunctionForOperation(
 		? 'file: File, options?: UploadOptions & { dirPath?: string, tags?: string[] }'
 		: combineAllParams(parameters, requestBodyParam)
 
-	const responseType = generateResponseType(operation.responses)
+	const { type: responseType, isArray: isArrayResponse } = generateResponseType(operation.responses)
 
-	// Always use ApiResponse wrapper for type consistency
-	// The create() method will handle single objects vs arrays at runtime
+	// For arrays: ApiResponse<T[]> (works as array, has metadata)
+	// For single objects: T (runtime adds metadata, but type is plain T for assignment)
+	// Note: At runtime, single objects have metadata but TypeScript sees plain type for better DX
 	const responseTypeStr = responseType
-		? `: Promise<ApiResponse<${responseType}>>`
+		? isArrayResponse
+			? `: Promise<ApiResponse<${responseType}>>`
+			: `: Promise<${responseType}>`
 		: ''
 
 	// Create JSDoc comment with OpenAPI documentation