@bagelink/sdk 0.0.1004 → 0.0.1008

package/dist/index.cjs

@@ -21,8 +21,12 @@ function resolveReference(ref) {
 function schemaToType(schema) {
   if (!schema)
     return "any";
-  if (schema.anyOf)
-    return schema.anyOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" | ");
+  if (schema.anyOf) {
+    let _t = schema.anyOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" | ");
+    if (_t === "" || _t === "null")
+      _t = "any";
+    return _t;
+  }
   if (schema.allOf)
     return schema.allOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" & ");
   if (schema.$ref)
@@ -44,7 +48,10 @@ function schemaToType(schema) {
       return "undefined";
     case "null":
       return "null";
+    case void 0:
+      return "any";
     default:
+      console.log("Unknown type", schema.type);
       return "any";
   }
 }
@@ -200,8 +207,15 @@ function fileTemplate(tsString, typeForImport, baseURL) {
   const templateCode = `import ax from 'axios';
 		 import type { AxiosResponse } from 'axios';
 		 import type {${typeForImport.join(", ")}} from './types.d';
-
-	export const axios = ax.create({baseURL:${baseURL}});
+		
+		function paramsSerializer(params: { [key: string]: any }) {
+	return Object.entries(params)
+		.flatMap(([key, value]) => [value]
+			.flat()
+			.map(v => \`\${encodeURIComponent(key)}=\${encodeURIComponent(v)}\`))
+		.join('&')
+	}
+	export const axios = ax.create({baseURL:${baseURL}, paramsSerializer});
 	${tsString}`;
   const doubleQuoteRegex = /"([^"]+)":/g;
   return templateCode.replace(doubleQuoteRegex, "$1:");

package/dist/index.mjs

@@ -15,8 +15,12 @@ function resolveReference(ref) {
 function schemaToType(schema) {
   if (!schema)
     return "any";
-  if (schema.anyOf)
-    return schema.anyOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" | ");
+  if (schema.anyOf) {
+    let _t = schema.anyOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" | ");
+    if (_t === "" || _t === "null")
+      _t = "any";
+    return _t;
+  }
   if (schema.allOf)
     return schema.allOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" & ");
   if (schema.$ref)
@@ -38,7 +42,10 @@ function schemaToType(schema) {
       return "undefined";
     case "null":
       return "null";
+    case void 0:
+      return "any";
     default:
+      console.log("Unknown type", schema.type);
       return "any";
   }
 }
@@ -194,8 +201,15 @@ function fileTemplate(tsString, typeForImport, baseURL) {
   const templateCode = `import ax from 'axios';
 		 import type { AxiosResponse } from 'axios';
 		 import type {${typeForImport.join(", ")}} from './types.d';
-
-	export const axios = ax.create({baseURL:${baseURL}});
+		
+		function paramsSerializer(params: { [key: string]: any }) {
+	return Object.entries(params)
+		.flatMap(([key, value]) => [value]
+			.flat()
+			.map(v => \`\${encodeURIComponent(key)}=\${encodeURIComponent(v)}\`))
+		.join('&')
+	}
+	export const axios = ax.create({baseURL:${baseURL}, paramsSerializer});
 	${tsString}`;
   const doubleQuoteRegex = /"([^"]+)":/g;
   return templateCode.replace(doubleQuoteRegex, "$1:");

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -178,8 +178,15 @@ function fileTemplate(tsString: string, typeForImport: string[], baseURL: string
 		`import ax from 'axios';
 		 import type { AxiosResponse } from 'axios';
 		 import type {${typeForImport.join(', ')}} from './types.d';
-
-	export const axios = ax.create({baseURL:${baseURL}});
+		
+		function paramsSerializer(params: { [key: string]: any }) {
+	return Object.entries(params)
+		.flatMap(([key, value]) => [value]
+			.flat()
+			.map(v => \`\${encodeURIComponent(key)}=\${encodeURIComponent(v)}\`))
+		.join('&')
+	}
+	export const axios = ax.create({baseURL:${baseURL}, paramsSerializer});
 	${tsString}`
 	)
 	const doubleQuoteRegex = /"([^"]+)":/g

package/src/openAPITools/typeGenerator.ts

@@ -4,6 +4,7 @@ import { formatType, formatVarType } from './utils'
 export function generateTypes(schemas: SchemasObject): string {
 	return Object.entries(schemas).map(([typeName, schema]) => {
 		typeName = formatType(typeName)
+
 		if (schema.enum) {
 			return `export type ${typeName} = ${schema.enum.map((item: string) => `'${item}'`).join(' | ')};\n`
 		}
@@ -11,6 +12,7 @@ export function generateTypes(schemas: SchemasObject): string {
 
 		const properties = Object.entries(schema.properties).map(([key, value]) => {
 			const varType = formatVarType(key, value)
+
 			return `\t\t${varType}`
 		}).join(';\n ')
 

package/src/openAPITools/utils.ts

@@ -17,7 +17,11 @@ function resolveReference(ref: string): string {
 
 export function schemaToType(schema?: SchemaObject): string {
 	if (!schema) return 'any'
-	if (schema.anyOf) return schema.anyOf.map(s => schemaToType(s)).filter(p => p !== 'any').join(' | ')
+	if (schema.anyOf) {
+		let _t = schema.anyOf.map(s => schemaToType(s)).filter(p => p !== 'any').join(' | ')
+		if (_t === '' || _t === 'null') _t = 'any'
+		return _t
+	}
 	if (schema.allOf) return schema.allOf.map(s => schemaToType(s)).filter(p => p !== 'any').join(' & ')
 	if (schema.$ref) return resolveReference(schema.$ref)
 	switch (schema.type) {
@@ -37,7 +41,10 @@ export function schemaToType(schema?: SchemaObject): string {
 			return 'undefined'
 		case 'null':
 			return 'null'
+		case undefined:
+			return 'any'
 		default:
+			console.log('Unknown type', schema.type)
 			return 'any'
 	}
 }