@bagelink/sdk 0.0.1084 → 0.0.1090

package/dist/index.cjs

@@ -127,7 +127,12 @@ function generateResponseType(responses) {
 function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr, parameters, requestBodyPayload) {
   if (allParams === "undefined")
     allParams = "";
-  let axiosFunction = `async (${allParams})${responseTypeStr} => {`;
+  const pathParams = formattedPath.match(/\$\{[^}]+\}/g)?.map((p) => p.slice(2, -1)) || [];
+  const functionParams = allParams.split(",").filter((param) => {
+    const paramName = param.split(":")[0].trim();
+    return !pathParams.includes(paramName);
+  }).join(",");
+  let axiosFunction = `async (${functionParams})${responseTypeStr} => {`;
   if (requestBodyPayload === "formData") {
     const paramStr = parameters?.config?.params ? `params: {${parameters.config.params}}` : "";
     axiosFunction += `
@@ -269,19 +274,52 @@ function createFunctionPlaceholder(path, method, operation) {
 function handlePathSegment(path, operation, existingObj = {}) {
   const methods = Object.keys(operation);
   const obj = {};
+  const pathParams = path.match(/\{[^}]+\}/g)?.map((p) => p.slice(1, -1)) || [];
+  let currentObj = obj;
+  for (const param of pathParams) {
+    const paramName = toCamelCase(param);
+    currentObj = { [paramName]: `(${paramName}: string) => ({` };
+  }
   for (const method of methods) {
     let functionName = method.toLowerCase();
     if (hasConflict(path, method)) {
       const params = getParamsFromPath(path);
       functionName += params ? `By${toPascalCase(params.pop() || "")}` : "All";
     }
-    obj[functionName] = createFunctionPlaceholder(path, method, operation[method]);
+    let target2 = currentObj;
+    while (typeof target2[Object.keys(target2)[0]] === "string") {
+      target2 = JSON.parse(target2[Object.keys(target2)[0]].slice(0, -1));
+    }
+    target2[functionName] = createFunctionPlaceholder(path, method, operation[method]);
+  }
+  let target = currentObj;
+  while (typeof target[Object.keys(target)[0]] === "string") {
+    target[Object.keys(target)[0]] += "})";
+    target = JSON.parse(target[Object.keys(target)[0]].slice(0, -2));
   }
   return { ...obj, ...existingObj };
 }
 function generateFunctions(paths, baseUrl) {
   let tsString = "";
   const body = {};
+  function createContextFunction(contextParam, contextValue, operations) {
+    let funcStr = `(${contextParam}: string) => ({`;
+    for (const [opName, operation] of Object.entries(operations)) {
+      if (typeof operation === "function") {
+        const opStr = operation.toString().replace(
+          new RegExp(`${contextValue}\\??:\\s*string,?\\s*`),
+          ""
+        );
+        funcStr += `
+  ${opName}: ${opStr},`;
+      } else {
+        funcStr += `
+  ${opName}: ${createContextFunction(contextParam, contextValue, operation)},`;
+      }
+    }
+    funcStr += "})";
+    return funcStr;
+  }
   const allPathsClean = Object.keys(paths).map(cleanPath);
   for (const [path, operation] of Object.entries(paths)) {
     const splitPath = path.split("/").filter((p) => p && !/\{|\}/.test(p));
@@ -296,15 +334,26 @@ function generateFunctions(paths, baseUrl) {
         acc[objFuncKey] = createFunctionPlaceholder(path, methods[0], opp);
       } else if (index === array.length - 1) {
         acc[objFuncKey] = handlePathSegment(path, operation, acc[objFuncKey]);
-      } else if (!acc[objFuncKey] || typeof acc[objFuncKey] !== "object") {
-        acc[objFuncKey] = {};
+      } else {
+        const pathParam = path.match(new RegExp(`/${key}/\\{([^}]+)\\}`));
+        if (pathParam) {
+          const paramName = toCamelCase(pathParam[1]);
+          acc[objFuncKey] = createContextFunction(paramName, paramName, acc[objFuncKey] || {});
+        } else if (!acc[objFuncKey] || typeof acc[objFuncKey] !== "object") {
+          acc[objFuncKey] = {};
+        }
       }
       return acc[objFuncKey];
     }, body);
   }
   for (const [parent, object] of Object.entries(body)) {
-    tsString += `export const ${parent} = ${JSON.stringify(object, void 0, 2)};
+    if (typeof object === "function") {
+      tsString += `export const ${parent} = ${object};
 `;
+    } else {
+      tsString += `export const ${parent} = ${JSON.stringify(object, void 0, 2)};
+`;
+    }
   }
   Object.entries(functionsInventory).forEach(([key, value]) => {
     tsString = tsString.replace(`"${key}"`, value);

package/dist/index.mjs

@@ -121,7 +121,12 @@ function generateResponseType(responses) {
 function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr, parameters, requestBodyPayload) {
   if (allParams === "undefined")
     allParams = "";
-  let axiosFunction = `async (${allParams})${responseTypeStr} => {`;
+  const pathParams = formattedPath.match(/\$\{[^}]+\}/g)?.map((p) => p.slice(2, -1)) || [];
+  const functionParams = allParams.split(",").filter((param) => {
+    const paramName = param.split(":")[0].trim();
+    return !pathParams.includes(paramName);
+  }).join(",");
+  let axiosFunction = `async (${functionParams})${responseTypeStr} => {`;
   if (requestBodyPayload === "formData") {
     const paramStr = parameters?.config?.params ? `params: {${parameters.config.params}}` : "";
     axiosFunction += `
@@ -263,19 +268,52 @@ function createFunctionPlaceholder(path, method, operation) {
 function handlePathSegment(path, operation, existingObj = {}) {
   const methods = Object.keys(operation);
   const obj = {};
+  const pathParams = path.match(/\{[^}]+\}/g)?.map((p) => p.slice(1, -1)) || [];
+  let currentObj = obj;
+  for (const param of pathParams) {
+    const paramName = toCamelCase(param);
+    currentObj = { [paramName]: `(${paramName}: string) => ({` };
+  }
   for (const method of methods) {
     let functionName = method.toLowerCase();
     if (hasConflict(path, method)) {
       const params = getParamsFromPath(path);
       functionName += params ? `By${toPascalCase(params.pop() || "")}` : "All";
     }
-    obj[functionName] = createFunctionPlaceholder(path, method, operation[method]);
+    let target2 = currentObj;
+    while (typeof target2[Object.keys(target2)[0]] === "string") {
+      target2 = JSON.parse(target2[Object.keys(target2)[0]].slice(0, -1));
+    }
+    target2[functionName] = createFunctionPlaceholder(path, method, operation[method]);
+  }
+  let target = currentObj;
+  while (typeof target[Object.keys(target)[0]] === "string") {
+    target[Object.keys(target)[0]] += "})";
+    target = JSON.parse(target[Object.keys(target)[0]].slice(0, -2));
   }
   return { ...obj, ...existingObj };
 }
 function generateFunctions(paths, baseUrl) {
   let tsString = "";
   const body = {};
+  function createContextFunction(contextParam, contextValue, operations) {
+    let funcStr = `(${contextParam}: string) => ({`;
+    for (const [opName, operation] of Object.entries(operations)) {
+      if (typeof operation === "function") {
+        const opStr = operation.toString().replace(
+          new RegExp(`${contextValue}\\??:\\s*string,?\\s*`),
+          ""
+        );
+        funcStr += `
+  ${opName}: ${opStr},`;
+      } else {
+        funcStr += `
+  ${opName}: ${createContextFunction(contextParam, contextValue, operation)},`;
+      }
+    }
+    funcStr += "})";
+    return funcStr;
+  }
   const allPathsClean = Object.keys(paths).map(cleanPath);
   for (const [path, operation] of Object.entries(paths)) {
     const splitPath = path.split("/").filter((p) => p && !/\{|\}/.test(p));
@@ -290,15 +328,26 @@ function generateFunctions(paths, baseUrl) {
         acc[objFuncKey] = createFunctionPlaceholder(path, methods[0], opp);
       } else if (index === array.length - 1) {
         acc[objFuncKey] = handlePathSegment(path, operation, acc[objFuncKey]);
-      } else if (!acc[objFuncKey] || typeof acc[objFuncKey] !== "object") {
-        acc[objFuncKey] = {};
+      } else {
+        const pathParam = path.match(new RegExp(`/${key}/\\{([^}]+)\\}`));
+        if (pathParam) {
+          const paramName = toCamelCase(pathParam[1]);
+          acc[objFuncKey] = createContextFunction(paramName, paramName, acc[objFuncKey] || {});
+        } else if (!acc[objFuncKey] || typeof acc[objFuncKey] !== "object") {
+          acc[objFuncKey] = {};
+        }
       }
       return acc[objFuncKey];
     }, body);
   }
   for (const [parent, object] of Object.entries(body)) {
-    tsString += `export const ${parent} = ${JSON.stringify(object, void 0, 2)};
+    if (typeof object === "function") {
+      tsString += `export const ${parent} = ${object};
 `;
+    } else {
+      tsString += `export const ${parent} = ${JSON.stringify(object, void 0, 2)};
+`;
+    }
   }
   Object.entries(functionsInventory).forEach(([key, value]) => {
     tsString = tsString.replace(`"${key}"`, value);

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -77,7 +77,16 @@ function generateAxiosFunction(
 ): string {
 	if (allParams === 'undefined') allParams = ''
 
-	let axiosFunction = `async (${allParams})${responseTypeStr} => {`
+	// Extract path parameters from the path using non-capturing group
+	const pathParams = formattedPath.match(/\$\{[^}]+\}/g)?.map(p => p.slice(2, -1)) || []
+
+	// Remove path parameters from allParams as they will be provided by context
+	const functionParams = allParams.split(',').filter((param) => {
+		const paramName = param.split(':')[0].trim()
+		return !pathParams.includes(paramName)
+	}).join(',')
+
+	let axiosFunction = `async (${functionParams})${responseTypeStr} => {`
 
 	if (requestBodyPayload === 'formData') {
 		const paramStr = parameters?.config?.params
@@ -272,50 +281,106 @@ function handlePathSegment(
 ) {
 	const methods = Object.keys(operation)
 	const obj: { [key: string]: any } = {}
+
+	// Extract path parameters for this segment using non-capturing group
+	const pathParams = path.match(/\{[^}]+\}/g)?.map(p => p.slice(1, -1)) || []
+
+	// Create context functions for path parameters
+	let currentObj = obj
+	for (const param of pathParams) {
+		const paramName = toCamelCase(param)
+		currentObj = { [paramName]: `(${paramName}: string) => ({` }
+	}
+
 	for (const method of methods) {
 		let functionName = method.toLowerCase()
 		if (hasConflict(path, method)) {
 			const params: string[] | undefined = getParamsFromPath(path)
 			functionName += (params ? `By${toPascalCase(params.pop() || '')}` : 'All')
 		}
-		obj[functionName] = createFunctionPlaceholder(path, method, operation[method])
+
+		// Add the function to the innermost context
+		let target = currentObj
+		while (typeof target[Object.keys(target)[0]] === 'string') {
+			target = JSON.parse(target[Object.keys(target)[0]].slice(0, -1))
+		}
+		target[functionName] = createFunctionPlaceholder(path, method, operation[method])
 	}
+
+	// Close all context function strings
+	let target = currentObj
+	while (typeof target[Object.keys(target)[0]] === 'string') {
+		target[Object.keys(target)[0]] += '})'
+		target = JSON.parse(target[Object.keys(target)[0]].slice(0, -2))
+	}
+
 	return { ...obj, ...existingObj }
 }
 
 export function generateFunctions(paths: PathsObject, baseUrl: string) {
 	let tsString = ''
 	const body: { [key: string]: any } = {}
+
+	// Helper to create context-based functions
+	function createContextFunction(contextParam: string, contextValue: string, operations: any) {
+		let funcStr = `(${contextParam}: string) => ({`
+		for (const [opName, operation] of Object.entries(operations)) {
+			if (typeof operation === 'function') {
+				// Remove the context parameter from the operation parameters
+				const opStr = operation.toString().replace(
+					new RegExp(`${contextValue}\\??:\\s*string,?\\s*`),
+					''
+				)
+				funcStr += `\n  ${opName}: ${opStr},`
+			} else {
+				funcStr += `\n  ${opName}: ${createContextFunction(contextParam, contextValue, operation)},`
+			}
+		}
+		funcStr += '})'
+		return funcStr
+	}
+
 	const allPathsClean = Object.keys(paths).map(cleanPath)
 	for (const [path, operation] of Object.entries(paths)) {
 		const splitPath = path.split('/').filter(p => p && !(/\{|\}/).test(p))
 		splitPath.reduce((acc, key: string, index: number, array: string[]) => {
 			const objFuncKey = toCamelCase(key)
 			if (!objFuncKey) return acc
+
 			const methods = Object.keys(operation)
-			if (
-				index === array.length - 1
-				&& methods.length === 1
-				&& allPathsClean.filter(p => p === cleanPath(path)).length === 1
-			) {
+			if (index === array.length - 1 && methods.length === 1 && allPathsClean.filter(p => p === cleanPath(path)).length === 1) {
 				const method: string = methods[0]
 				const opp: any = { ...operation }[method]
 				acc[objFuncKey] = createFunctionPlaceholder(path, methods[0], opp)
-			} else if (
-				index === array.length - 1
-			) { acc[objFuncKey] = handlePathSegment(path, operation, acc[objFuncKey])
-			}
-			else if (!acc[objFuncKey] || typeof acc[objFuncKey] !== 'object') { acc[objFuncKey] = {}
+			} else if (index === array.length - 1) {
+				acc[objFuncKey] = handlePathSegment(path, operation, acc[objFuncKey])
+			} else {
+				// Check if this segment contains a path parameter
+				const pathParam = path.match(new RegExp(`/${key}/\\{([^}]+)\\}`))
+				if (pathParam) {
+					// This segment should be a function that takes the path parameter
+					const paramName = toCamelCase(pathParam[1])
+					acc[objFuncKey] = createContextFunction(paramName, paramName, acc[objFuncKey] || {})
+				} else if (!acc[objFuncKey] || typeof acc[objFuncKey] !== 'object') {
+					acc[objFuncKey] = {}
+				}
 			}
 			return acc[objFuncKey]
 		}, body)
 	}
+
 	for (const [parent, object] of Object.entries(body)) {
-		tsString += `export const ${parent} = ${JSON.stringify(object, undefined, 2)};\n`
+		if (typeof object === 'function') {
+			tsString += `export const ${parent} = ${object};\n`
+		} else {
+			tsString += `export const ${parent} = ${JSON.stringify(object, undefined, 2)};\n`
+		}
 	}
+
 	Object.entries(functionsInventory).forEach(([key, value]) => {
 		tsString = tsString.replace(`"${key}"`, value)
 	})
+
 	tsString = fileTemplate(tsString, allTypes, baseUrl)
 	return tsString
 }