@bagelink/sdk 1.9.86 → 1.9.90

package/dist/index.cjs

@@ -460,7 +460,7 @@ function formatPathWithParams(path) {
   if (!params) {
     return `'${path}'`;
   }
-  return `\`${path.replace(/\{([^}]+)\}/g, (_, paramName) => `\${${toCamelCase(paramName)}}`)}\``;
+  return `\`${path.replace(/\{([^}]+)\}/g, (_, paramName) => `\${${toCamelCaseSafe(paramName)}}`)}\``;
 }
 function generateRequestBody(requestBody) {
   const content = dereference(requestBody)?.content;
@@ -495,10 +495,7 @@ function generateRequestBody(requestBody) {
   });
   return { requestBodyParam, requestBodyPayload };
 }
-function generateFunctionParameters(params, isFileUpload = false) {
-  if (!params?.length) {
-    return {};
-  }
+function generateFunctionParameters(path, params, isFileUpload = false) {
   if (isFileUpload) {
     return {
       config: {
@@ -510,7 +507,8 @@ function generateFunctionParameters(params, isFileUpload = false) {
   }
   const functionParams = [];
   const queryParams = [];
-  for (const p of params) {
+  const declaredPathParams = /* @__PURE__ */ new Set();
+  for (const p of params ?? []) {
     const param = dereference(p);
     const pSchema = dereference(param.schema);
     const paramType = schemaToType(pSchema);
@@ -521,6 +519,9 @@ function generateFunctionParameters(params, isFileUpload = false) {
     if (needsMapping && (param.in === "query" || param.in === "header")) {
       varName = `_${varName}`;
     }
+    if (param.in === "path") {
+      declaredPathParams.add(paramName);
+    }
     if (param.in === "path" || param.in === "query" || param.in === "header") {
       functionParams.push(
         formatVarType({
@@ -537,6 +538,16 @@ function generateFunctionParameters(params, isFileUpload = false) {
       );
     }
   }
+  const pathParamsInUrl = getParamsFromPath(path) ?? [];
+  for (const paramName of pathParamsInUrl) {
+    if (!declaredPathParams.has(paramName)) {
+      const varName = toCamelCaseSafe(paramName);
+      functionParams.unshift(`${varName}: string`);
+    }
+  }
+  if (functionParams.length === 0 && queryParams.length === 0) {
+    return {};
+  }
   return {
     params: functionParams.join(", "),
     config: queryParams.length ? { params: queryParams.join(", ") } : void 0
@@ -726,6 +737,7 @@ function generateFunctionForOperation(method, path, operation) {
   const multiPartSchema = dereference(operation.requestBody)?.content?.["multipart/form-data"]?.schema;
   const isFileUpload = isReferenceObject(multiPartSchema) && multiPartSchema?.$ref?.includes("Body_upload_files");
   const parameters = generateFunctionParameters(
+    path,
     operation.parameters,
     isFileUpload
   );

package/dist/index.mjs

@@ -454,7 +454,7 @@ function formatPathWithParams(path) {
   if (!params) {
     return `'${path}'`;
   }
-  return `\`${path.replace(/\{([^}]+)\}/g, (_, paramName) => `\${${toCamelCase(paramName)}}`)}\``;
+  return `\`${path.replace(/\{([^}]+)\}/g, (_, paramName) => `\${${toCamelCaseSafe(paramName)}}`)}\``;
 }
 function generateRequestBody(requestBody) {
   const content = dereference(requestBody)?.content;
@@ -489,10 +489,7 @@ function generateRequestBody(requestBody) {
   });
   return { requestBodyParam, requestBodyPayload };
 }
-function generateFunctionParameters(params, isFileUpload = false) {
-  if (!params?.length) {
-    return {};
-  }
+function generateFunctionParameters(path, params, isFileUpload = false) {
   if (isFileUpload) {
     return {
       config: {
@@ -504,7 +501,8 @@ function generateFunctionParameters(params, isFileUpload = false) {
   }
   const functionParams = [];
   const queryParams = [];
-  for (const p of params) {
+  const declaredPathParams = /* @__PURE__ */ new Set();
+  for (const p of params ?? []) {
     const param = dereference(p);
     const pSchema = dereference(param.schema);
     const paramType = schemaToType(pSchema);
@@ -515,6 +513,9 @@ function generateFunctionParameters(params, isFileUpload = false) {
     if (needsMapping && (param.in === "query" || param.in === "header")) {
       varName = `_${varName}`;
     }
+    if (param.in === "path") {
+      declaredPathParams.add(paramName);
+    }
     if (param.in === "path" || param.in === "query" || param.in === "header") {
       functionParams.push(
         formatVarType({
@@ -531,6 +532,16 @@ function generateFunctionParameters(params, isFileUpload = false) {
       );
     }
   }
+  const pathParamsInUrl = getParamsFromPath(path) ?? [];
+  for (const paramName of pathParamsInUrl) {
+    if (!declaredPathParams.has(paramName)) {
+      const varName = toCamelCaseSafe(paramName);
+      functionParams.unshift(`${varName}: string`);
+    }
+  }
+  if (functionParams.length === 0 && queryParams.length === 0) {
+    return {};
+  }
   return {
     params: functionParams.join(", "),
     config: queryParams.length ? { params: queryParams.join(", ") } : void 0
@@ -720,6 +731,7 @@ function generateFunctionForOperation(method, path, operation) {
   const multiPartSchema = dereference(operation.requestBody)?.content?.["multipart/form-data"]?.schema;
   const isFileUpload = isReferenceObject(multiPartSchema) && multiPartSchema?.$ref?.includes("Body_upload_files");
   const parameters = generateFunctionParameters(
+    path,
     operation.parameters,
     isFileUpload
   );

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -21,7 +21,6 @@ import {
 	formatType,
 	formatVarType,
 	schemaToType,
-	toCamelCase,
 	toCamelCaseSafe,
 	toPascalCase,
 } from './utils'
@@ -165,7 +164,7 @@ function formatPathWithParams(path: string): string {
 	const params = getParamsFromPath(path)
 	if (!params) { return `'${path}'` }
 
-	return `\`${path.replace(/\{([^}]+)\}/g, (_, paramName) => `\${${toCamelCase(paramName)}}`)}\``
+	return `\`${path.replace(/\{([^}]+)\}/g, (_, paramName) => `\${${toCamelCaseSafe(paramName)}}`)}\``
 }
 
 /**
@@ -230,16 +229,16 @@ function generateRequestBody(requestBody?: OpenAPIOperation['requestBody']): {
 
 /**
  * Generates function parameters from OpenAPI parameters
+ * @param path - The API path (used to detect path params missing from spec)
  * @param params - The OpenAPI parameters
  * @param isFileUpload - Whether this is a file upload operation
  * @returns Object containing parameter information
  */
 function generateFunctionParameters(
+	path: string,
 	params?: OpenAPIOperation['parameters'],
 	isFileUpload = false
 ): { params?: string, config?: { params?: string } } {
-	if (!params?.length) { return {} }
-
 	// Special handling for file uploads
 	if (isFileUpload) {
 		return {
@@ -253,7 +252,10 @@ function generateFunctionParameters(
 	const functionParams: string[] = []
 	const queryParams: string[] = []
 
-	for (const p of params) {
+	// Track which path params are already declared from the spec
+	const declaredPathParams = new Set<string>()
+
+	for (const p of (params ?? [])) {
 		const param = dereference(p)
 		const pSchema = dereference(param.schema)
 
@@ -269,6 +271,10 @@ function generateFunctionParameters(
 			varName = `_${varName}`
 		}
 
+		if (param.in === 'path') {
+			declaredPathParams.add(paramName)
+		}
+
 		if (param.in === 'path' || param.in === 'query' || param.in === 'header') {
 			functionParams.push(
 				formatVarType({
@@ -287,6 +293,17 @@ function generateFunctionParameters(
 		}
 	}
 
+	// Inject any path params present in the URL but missing from the spec's parameters list
+	const pathParamsInUrl = getParamsFromPath(path) ?? []
+	for (const paramName of pathParamsInUrl) {
+		if (!declaredPathParams.has(paramName)) {
+			const varName = toCamelCaseSafe(paramName)
+			functionParams.unshift(`${varName}: string`)
+		}
+	}
+
+	if (functionParams.length === 0 && queryParams.length === 0) { return {} }
+
 	return {
 		params: functionParams.join(', '),
 		config: queryParams.length ? { params: queryParams.join(', ') } : undefined,
@@ -629,6 +646,7 @@ function generateFunctionForOperation(
 	const isFileUpload = isReferenceObject(multiPartSchema) && multiPartSchema?.$ref?.includes('Body_upload_files')
 
 	const parameters = generateFunctionParameters(
+		path,
 		operation.parameters,
 		isFileUpload
 	)