@bagelink/sdk 1.4.188 → 1.5.3

package/dist/index.cjs

@@ -385,6 +385,17 @@ function generateFunctionParameters(params, isFileUpload = false) {
     config: queryParams.length ? { params: queryParams.join(", ") } : void 0
   };
 }
+function parseParameter(paramStr) {
+  const trimmed = paramStr.trim();
+  const isOptional = trimmed.includes("?:");
+  const nameMatch = trimmed.match(/^([a-z_$][\w$]*)/i);
+  const name = nameMatch ? nameMatch[1] : "";
+  const typeMatch = trimmed.match(/:\s*([^=]+)/);
+  const type = typeMatch ? typeMatch[1].trim() : "any";
+  const defaultMatch = trimmed.match(/=(.+)$/);
+  const defaultValue = defaultMatch ? defaultMatch[1].trim() : void 0;
+  return { name, type, defaultValue, isOptional };
+}
 function combineAllParams(parameters, requestBodyParam) {
   let allParamsArray = [];
   if (parameters.params) {
@@ -393,7 +404,15 @@ function combineAllParams(parameters, requestBodyParam) {
   if (requestBodyParam) {
     allParamsArray.push(requestBodyParam.trim());
   }
-  return allParamsArray.filter(Boolean).sort((a, b) => (a.includes("?") ? 1 : -1) - (b.includes("?") ? 1 : -1)).join(", ");
+  if (allParamsArray.length === 0) {
+    return "";
+  }
+  const parsedParams = allParamsArray.filter(Boolean).map(parseParameter);
+  const destructuredNames = parsedParams.map((p) => p.defaultValue ? `${p.name} = ${p.defaultValue}` : p.name).join(", ");
+  const typeDefinition = parsedParams.map((p) => {
+    return `${p.name}?: ${p.type}`;
+  }).join(", ");
+  return `{ ${destructuredNames} }: { ${typeDefinition} } = {}`;
 }
 function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr, parameters, requestBodyPayload) {
   if (allParams === "undefined") allParams = "";

package/dist/index.mjs

@@ -379,6 +379,17 @@ function generateFunctionParameters(params, isFileUpload = false) {
     config: queryParams.length ? { params: queryParams.join(", ") } : void 0
   };
 }
+function parseParameter(paramStr) {
+  const trimmed = paramStr.trim();
+  const isOptional = trimmed.includes("?:");
+  const nameMatch = trimmed.match(/^([a-z_$][\w$]*)/i);
+  const name = nameMatch ? nameMatch[1] : "";
+  const typeMatch = trimmed.match(/:\s*([^=]+)/);
+  const type = typeMatch ? typeMatch[1].trim() : "any";
+  const defaultMatch = trimmed.match(/=(.+)$/);
+  const defaultValue = defaultMatch ? defaultMatch[1].trim() : void 0;
+  return { name, type, defaultValue, isOptional };
+}
 function combineAllParams(parameters, requestBodyParam) {
   let allParamsArray = [];
   if (parameters.params) {
@@ -387,7 +398,15 @@ function combineAllParams(parameters, requestBodyParam) {
   if (requestBodyParam) {
     allParamsArray.push(requestBodyParam.trim());
   }
-  return allParamsArray.filter(Boolean).sort((a, b) => (a.includes("?") ? 1 : -1) - (b.includes("?") ? 1 : -1)).join(", ");
+  if (allParamsArray.length === 0) {
+    return "";
+  }
+  const parsedParams = allParamsArray.filter(Boolean).map(parseParameter);
+  const destructuredNames = parsedParams.map((p) => p.defaultValue ? `${p.name} = ${p.defaultValue}` : p.name).join(", ");
+  const typeDefinition = parsedParams.map((p) => {
+    return `${p.name}?: ${p.type}`;
+  }).join(", ");
+  return `{ ${destructuredNames} }: { ${typeDefinition} } = {}`;
 }
 function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr, parameters, requestBodyPayload) {
   if (allParams === "undefined") allParams = "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/sdk",
   "type": "module",
-  "version": "1.4.188",
+  "version": "1.5.3",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Neveh Allon",

package/src/openAPITools/functionGenerator.ts

@@ -266,10 +266,41 @@ function generateFunctionParameters(
 }
 
 /**
- * Combines and formats all parameters into a single parameter string
+ * Parses a parameter string into name, type, and default value
+ * @param paramStr - The parameter string to parse
+ * @returns Object containing parsed parameter information
+ */
+function parseParameter(paramStr: string): {
+	name: string
+	type: string
+	defaultValue?: string
+	isOptional: boolean
+} {
+	const trimmed = paramStr.trim()
+
+	// Check if parameter is optional (has ?)
+	const isOptional = trimmed.includes('?:')
+
+	// Extract parameter name
+	const nameMatch = trimmed.match(/^([a-z_$][\w$]*)/i)
+	const name = nameMatch ? nameMatch[1] : ''
+
+	// Extract type (between : and = or end of string)
+	const typeMatch = trimmed.match(/:\s*([^=]+)/)
+	const type = typeMatch ? typeMatch[1].trim() : 'any'
+
+	// Extract default value if exists
+	const defaultMatch = trimmed.match(/=(.+)$/)
+	const defaultValue = defaultMatch ? defaultMatch[1].trim() : undefined
+
+	return { name, type, defaultValue, isOptional }
+}
+
+/**
+ * Combines and formats all parameters into a single object destructuring parameter
  * @param parameters - The parameters object
  * @param requestBodyParam - The request body parameter
- * @returns A formatted parameter string
+ * @returns A formatted parameter string with object destructuring
  */
 function combineAllParams(
 	parameters: { params?: string },
@@ -285,11 +316,27 @@ function combineAllParams(
 		allParamsArray.push(requestBodyParam.trim())
 	}
 
-	// Sort required parameters before optional ones
-	return allParamsArray
-		.filter(Boolean)
-		.sort((a, b) => (a.includes('?') ? 1 : -1) - (b.includes('?') ? 1 : -1))
+	if (allParamsArray.length === 0) {
+		return ''
+	}
+
+	// Parse all parameters
+	const parsedParams = allParamsArray.filter(Boolean).map(parseParameter)
+
+	// Build destructuring pattern with default values
+	const destructuredNames = parsedParams
+		.map(p => p.defaultValue ? `${p.name} = ${p.defaultValue}` : p.name)
 		.join(', ')
+
+	// Build type definition - all parameters should be optional in the type
+	const typeDefinition = parsedParams
+		.map((p) => {
+			// Remove default value from type, make all optional
+			return `${p.name}?: ${p.type}`
+		})
+		.join(', ')
+
+	return `{ ${destructuredNames} }: { ${typeDefinition} } = {}`
 }
 
 /**