@bagelink/sdk 1.4.69 → 1.4.73

package/dist/index.cjs

@@ -126,6 +126,126 @@ function formatVarType({
   if (defaultStr) optionalStr = "";
   return `${varName}${optionalStr}: ${type}${defaultStr}`;
 }
+const RESERVED_KEYWORDS = /* @__PURE__ */ new Set([
+  // JavaScript reserved words
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "enum",
+  "export",
+  "extends",
+  "false",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "import",
+  "in",
+  "instanceof",
+  "new",
+  "null",
+  "return",
+  "super",
+  "switch",
+  "this",
+  "throw",
+  "true",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  "yield",
+  // TypeScript reserved words
+  "abstract",
+  "any",
+  "as",
+  "asserts",
+  "bigint",
+  "boolean",
+  "constructor",
+  "declare",
+  "get",
+  "infer",
+  "intrinsic",
+  "is",
+  "keyof",
+  "module",
+  "namespace",
+  "never",
+  "number",
+  "object",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "readonly",
+  "require",
+  "set",
+  "static",
+  "string",
+  "symbol",
+  "type",
+  "undefined",
+  "unique",
+  "unknown",
+  // Strict mode reserved words
+  "implements",
+  "interface",
+  "let",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "static",
+  // Common global identifiers to avoid
+  "arguments",
+  "eval",
+  "Infinity",
+  "NaN",
+  "undefined",
+  "globalThis",
+  "window",
+  "document",
+  "console",
+  "Object",
+  "Array",
+  "Function",
+  "String",
+  "Number",
+  "Boolean",
+  "Date",
+  "RegExp",
+  "Error",
+  "Promise",
+  "Map",
+  "Set",
+  "WeakMap",
+  "WeakSet",
+  "Symbol",
+  "Proxy",
+  "Reflect"
+]);
+function sanitizeVarName(varName) {
+  if (!varName) return varName;
+  if (RESERVED_KEYWORDS.has(varName.toLowerCase())) {
+    return `${varName}_`;
+  }
+  return varName;
+}
+function toCamelCaseSafe(str) {
+  const camelCased = toCamelCase(str);
+  return sanitizeVarName(camelCased);
+}
 function cleanPath(path) {
   return path.split("/").filter((p) => p && !/\{|\}/.test(p)).join("/");
 }
@@ -216,7 +336,7 @@ function generateRequestBody(requestBody) {
   const bodySchema = dereference(jsonContent.schema);
   const requestBodyType = schemaToType(bodySchema);
   collectTypeForImportStatement(requestBodyType);
-  const requestBodyPayload = toCamelCase(bodySchema.title) || toCamelCase(requestBodyType) || "requestBody";
+  const requestBodyPayload = toCamelCaseSafe(bodySchema.title) || toCamelCaseSafe(requestBodyType) || "requestBody";
   const requestBodyParam = formatVarType({
     varName: requestBodyPayload,
     schema: bodySchema,
@@ -243,7 +363,7 @@ function generateFunctionParameters(params, isFileUpload = false) {
     const paramType = schemaToType(pSchema);
     collectTypeForImportStatement(paramType);
     const paramName = param.name;
-    const varName = toCamelCase(param.name);
+    const varName = toCamelCaseSafe(param.name);
     if (param.in === "path" || param.in === "query" || param.in === "header") {
       functionParams.push(
         formatVarType({
@@ -394,7 +514,7 @@ function generateFunctions(paths, baseUrl) {
   for (const [path, operation] of Object.entries(paths)) {
     const splitPath = path.split("/").filter((p) => p && !/\{|\}/.test(p));
     splitPath.reduce((acc, key, index, array) => {
-      const objFuncKey = toCamelCase(key);
+      const objFuncKey = toCamelCaseSafe(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) {

package/dist/index.mjs

@@ -120,6 +120,126 @@ function formatVarType({
   if (defaultStr) optionalStr = "";
   return `${varName}${optionalStr}: ${type}${defaultStr}`;
 }
+const RESERVED_KEYWORDS = /* @__PURE__ */ new Set([
+  // JavaScript reserved words
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "enum",
+  "export",
+  "extends",
+  "false",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "import",
+  "in",
+  "instanceof",
+  "new",
+  "null",
+  "return",
+  "super",
+  "switch",
+  "this",
+  "throw",
+  "true",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  "yield",
+  // TypeScript reserved words
+  "abstract",
+  "any",
+  "as",
+  "asserts",
+  "bigint",
+  "boolean",
+  "constructor",
+  "declare",
+  "get",
+  "infer",
+  "intrinsic",
+  "is",
+  "keyof",
+  "module",
+  "namespace",
+  "never",
+  "number",
+  "object",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "readonly",
+  "require",
+  "set",
+  "static",
+  "string",
+  "symbol",
+  "type",
+  "undefined",
+  "unique",
+  "unknown",
+  // Strict mode reserved words
+  "implements",
+  "interface",
+  "let",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "static",
+  // Common global identifiers to avoid
+  "arguments",
+  "eval",
+  "Infinity",
+  "NaN",
+  "undefined",
+  "globalThis",
+  "window",
+  "document",
+  "console",
+  "Object",
+  "Array",
+  "Function",
+  "String",
+  "Number",
+  "Boolean",
+  "Date",
+  "RegExp",
+  "Error",
+  "Promise",
+  "Map",
+  "Set",
+  "WeakMap",
+  "WeakSet",
+  "Symbol",
+  "Proxy",
+  "Reflect"
+]);
+function sanitizeVarName(varName) {
+  if (!varName) return varName;
+  if (RESERVED_KEYWORDS.has(varName.toLowerCase())) {
+    return `${varName}_`;
+  }
+  return varName;
+}
+function toCamelCaseSafe(str) {
+  const camelCased = toCamelCase(str);
+  return sanitizeVarName(camelCased);
+}
 function cleanPath(path) {
   return path.split("/").filter((p) => p && !/\{|\}/.test(p)).join("/");
 }
@@ -210,7 +330,7 @@ function generateRequestBody(requestBody) {
   const bodySchema = dereference(jsonContent.schema);
   const requestBodyType = schemaToType(bodySchema);
   collectTypeForImportStatement(requestBodyType);
-  const requestBodyPayload = toCamelCase(bodySchema.title) || toCamelCase(requestBodyType) || "requestBody";
+  const requestBodyPayload = toCamelCaseSafe(bodySchema.title) || toCamelCaseSafe(requestBodyType) || "requestBody";
   const requestBodyParam = formatVarType({
     varName: requestBodyPayload,
     schema: bodySchema,
@@ -237,7 +357,7 @@ function generateFunctionParameters(params, isFileUpload = false) {
     const paramType = schemaToType(pSchema);
     collectTypeForImportStatement(paramType);
     const paramName = param.name;
-    const varName = toCamelCase(param.name);
+    const varName = toCamelCaseSafe(param.name);
     if (param.in === "path" || param.in === "query" || param.in === "header") {
       functionParams.push(
         formatVarType({
@@ -388,7 +508,7 @@ function generateFunctions(paths, baseUrl) {
   for (const [path, operation] of Object.entries(paths)) {
     const splitPath = path.split("/").filter((p) => p && !/\{|\}/.test(p));
     splitPath.reduce((acc, key, index, array) => {
-      const objFuncKey = toCamelCase(key);
+      const objFuncKey = toCamelCaseSafe(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) {

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -16,6 +16,7 @@ import {
 	formatVarType,
 	schemaToType,
 	toCamelCase,
+	toCamelCaseSafe,
 	toPascalCase,
 } from './utils'
 
@@ -194,7 +195,7 @@ function generateRequestBody(requestBody?: OpenAPIOperation['requestBody']): {
 	collectTypeForImportStatement(requestBodyType)
 
 	const requestBodyPayload = (
-		toCamelCase(bodySchema.title) || toCamelCase(requestBodyType) || 'requestBody'
+		toCamelCaseSafe(bodySchema.title) || toCamelCaseSafe(requestBodyType) || 'requestBody'
 	)
 
 	const requestBodyParam = formatVarType({
@@ -238,7 +239,7 @@ function generateFunctionParameters(
 		const paramType = schemaToType(pSchema)
 		collectTypeForImportStatement(paramType)
 		const paramName = param.name
-		const varName = toCamelCase(param.name)
+		const varName = toCamelCaseSafe(param.name)
 
 		if (param.in === 'path' || param.in === 'query' || param.in === 'header') {
 			functionParams.push(
@@ -536,7 +537,7 @@ export function generateFunctions(paths: OpenAPIPaths, baseUrl: string): string
 		const splitPath = path.split('/').filter(p => p && !/\{|\}/.test(p))
 
 		splitPath.reduce((acc, key: string, index: number, array: string[]) => {
-			const objFuncKey = toCamelCase(key)
+			const objFuncKey = toCamelCaseSafe(key)
 			if (!objFuncKey) return acc
 
 			const methods = Object.keys(operation) as Array<keyof OpenAPIPath>

package/src/openAPITools/utils.ts

@@ -144,6 +144,145 @@ export function formatVarType({
 	return `${varName}${optionalStr}: ${type}${defaultStr}`
 }
 
+/**
+ * List of JavaScript/TypeScript reserved keywords and common identifiers to avoid
+ */
+const RESERVED_KEYWORDS = new Set([
+	// JavaScript reserved words
+	'break',
+	'case',
+	'catch',
+	'class',
+	'const',
+	'continue',
+	'debugger',
+	'default',
+	'delete',
+	'do',
+	'else',
+	'enum',
+	'export',
+	'extends',
+	'false',
+	'finally',
+	'for',
+	'function',
+	'if',
+	'import',
+	'in',
+	'instanceof',
+	'new',
+	'null',
+	'return',
+	'super',
+	'switch',
+	'this',
+	'throw',
+	'true',
+	'try',
+	'typeof',
+	'var',
+	'void',
+	'while',
+	'with',
+	'yield',
+	// TypeScript reserved words
+	'abstract',
+	'any',
+	'as',
+	'asserts',
+	'bigint',
+	'boolean',
+	'constructor',
+	'declare',
+	'get',
+	'infer',
+	'intrinsic',
+	'is',
+	'keyof',
+	'module',
+	'namespace',
+	'never',
+	'number',
+	'object',
+	'package',
+	'private',
+	'protected',
+	'public',
+	'readonly',
+	'require',
+	'set',
+	'static',
+	'string',
+	'symbol',
+	'type',
+	'undefined',
+	'unique',
+	'unknown',
+	// Strict mode reserved words
+	'implements',
+	'interface',
+	'let',
+	'package',
+	'private',
+	'protected',
+	'public',
+	'static',
+	// Common global identifiers to avoid
+	'arguments',
+	'eval',
+	'Infinity',
+	'NaN',
+	'undefined',
+	'globalThis',
+	'window',
+	'document',
+	'console',
+	'Object',
+	'Array',
+	'Function',
+	'String',
+	'Number',
+	'Boolean',
+	'Date',
+	'RegExp',
+	'Error',
+	'Promise',
+	'Map',
+	'Set',
+	'WeakMap',
+	'WeakSet',
+	'Symbol',
+	'Proxy',
+	'Reflect'
+])
+
+/**
+ * Sanitizes a variable name to ensure it's not a reserved keyword
+ * @param varName - The variable name to sanitize
+ * @returns A safe variable name
+ */
+export function sanitizeVarName(varName: string): string {
+	if (!varName) return varName
+
+	// If it's a reserved keyword, append underscore
+	if (RESERVED_KEYWORDS.has(varName.toLowerCase())) {
+		return `${varName}_`
+	}
+
+	return varName
+}
+
+/**
+ * Converts a string to camelCase and ensures it's not a reserved keyword
+ * @param str - The string to convert
+ * @returns A safe camelCase variable name
+ */
+export function toCamelCaseSafe(str?: string): string {
+	const camelCased = toCamelCase(str)
+	return sanitizeVarName(camelCased)
+}
+
 export function cleanPath(path: string) {
 	return path
 		.split('/')