@bagelink/sdk 0.0.1125 → 0.0.1131

package/dist/index.cjs

@@ -115,11 +115,15 @@ function collectTypeForImportStatement(typeName) {
   if (!typeName || isPrimitive) return;
   if (!allTypes.includes(typeName)) allTypes.push(typeName);
 }
+function schemaToTypeWithCollection(schema) {
+  const type = schemaToType(schema);
+  collectTypeForImportStatement(type);
+  return type;
+}
 function getResponseType(response) {
   const mediaTypeObject = response.content?.["application/json"];
   if (!mediaTypeObject || !mediaTypeObject.schema) return;
-  const responseType = schemaToType(mediaTypeObject.schema);
-  collectTypeForImportStatement(responseType);
+  const responseType = schemaToTypeWithCollection(mediaTypeObject.schema);
   return responseType;
 }
 function generateResponseType(responses) {
@@ -262,6 +266,7 @@ function generateFunctionForOperation(method, path, operation) {
   );
 }
 const generateRandomString = () => Math.random().toString(36).slice(7);
+const DOUBLE_QUOTE_REGEX = /"([^"]+)":/g;
 function fileTemplate(tsString, typeForImport, baseURL) {
   const templateCode = `import ax from 'axios';
 		 import type { AxiosResponse } from 'axios';
@@ -275,8 +280,7 @@ function fileTemplate(tsString, typeForImport, baseURL) {
 
 	export const axios = ax.create({baseURL:${baseURL}});
 	${tsString}`;
-  const doubleQuoteRegex = /"([^"]+)":/g;
-  return templateCode.replace(doubleQuoteRegex, "$1:");
+  return templateCode.replace(DOUBLE_QUOTE_REGEX, "$1:");
 }
 const functionsInventory = {};
 const pathOperations = [];
@@ -354,7 +358,15 @@ function generateTypes(schemas) {
       return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
 `;
     }
-    if (!schema.properties) return "";
+    if (schema.type === "array" && schema.items) {
+      return `export type ${typeName} = ${schemaToType(schema.items)}[];
+`;
+    }
+    if (!schema.properties) {
+      console.log("No properties found for schema:", typeName);
+      console.log(JSON.stringify({ typeName, schema }, null, 2));
+      return "";
+    }
     const properties = Object.entries(schema.properties).map(([key, value]) => {
       const varType = formatVarType({ varName: key, schema: value });
       return `		${varType}`;

package/dist/index.mjs

@@ -109,11 +109,15 @@ function collectTypeForImportStatement(typeName) {
   if (!typeName || isPrimitive) return;
   if (!allTypes.includes(typeName)) allTypes.push(typeName);
 }
+function schemaToTypeWithCollection(schema) {
+  const type = schemaToType(schema);
+  collectTypeForImportStatement(type);
+  return type;
+}
 function getResponseType(response) {
   const mediaTypeObject = response.content?.["application/json"];
   if (!mediaTypeObject || !mediaTypeObject.schema) return;
-  const responseType = schemaToType(mediaTypeObject.schema);
-  collectTypeForImportStatement(responseType);
+  const responseType = schemaToTypeWithCollection(mediaTypeObject.schema);
   return responseType;
 }
 function generateResponseType(responses) {
@@ -256,6 +260,7 @@ function generateFunctionForOperation(method, path, operation) {
   );
 }
 const generateRandomString = () => Math.random().toString(36).slice(7);
+const DOUBLE_QUOTE_REGEX = /"([^"]+)":/g;
 function fileTemplate(tsString, typeForImport, baseURL) {
   const templateCode = `import ax from 'axios';
 		 import type { AxiosResponse } from 'axios';
@@ -269,8 +274,7 @@ function fileTemplate(tsString, typeForImport, baseURL) {
 
 	export const axios = ax.create({baseURL:${baseURL}});
 	${tsString}`;
-  const doubleQuoteRegex = /"([^"]+)":/g;
-  return templateCode.replace(doubleQuoteRegex, "$1:");
+  return templateCode.replace(DOUBLE_QUOTE_REGEX, "$1:");
 }
 const functionsInventory = {};
 const pathOperations = [];
@@ -348,7 +352,15 @@ function generateTypes(schemas) {
       return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
 `;
     }
-    if (!schema.properties) return "";
+    if (schema.type === "array" && schema.items) {
+      return `export type ${typeName} = ${schemaToType(schema.items)}[];
+`;
+    }
+    if (!schema.properties) {
+      console.log("No properties found for schema:", typeName);
+      console.log(JSON.stringify({ typeName, schema }, null, 2));
+      return "";
+    }
     const properties = Object.entries(schema.properties).map(([key, value]) => {
       const varType = formatVarType({ varName: key, schema: value });
       return `		${varType}`;

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -5,6 +5,7 @@ import type {
 	RequestBodyObject,
 	ResponseObject,
 	ResponsesObject,
+	SchemaObject,
 } from './openApiTypes'
 
 import {
@@ -44,11 +45,16 @@ function collectTypeForImportStatement(typeName: string) {
 	if (!allTypes.includes(typeName)) allTypes.push(typeName)
 }
 
+function schemaToTypeWithCollection(schema?: SchemaObject): string {
+	const type = schemaToType(schema)
+	collectTypeForImportStatement(type)
+	return type
+}
+
 function getResponseType(response: ResponseObject): string | undefined {
 	const mediaTypeObject = response.content?.['application/json']
 	if (!mediaTypeObject || !mediaTypeObject.schema) return
-	const responseType = schemaToType(mediaTypeObject.schema)
-	collectTypeForImportStatement(responseType)
+	const responseType = schemaToTypeWithCollection(mediaTypeObject.schema)
 	return responseType
 }
 
@@ -280,6 +286,8 @@ function generateFunctionForOperation(
 
 const generateRandomString = () => Math.random().toString(36).slice(7)
 
+const DOUBLE_QUOTE_REGEX = /"([^"]+)":/g // ! TODO: @nevehallon believes this may not be necessary
+
 function fileTemplate(
 	tsString: string,
 	typeForImport: string[],
@@ -297,8 +305,7 @@ function fileTemplate(
 
 	export const axios = ax.create({baseURL:${baseURL}});
 	${tsString}`
-	const doubleQuoteRegex = /"([^"]+)":/g
-	return templateCode.replace(doubleQuoteRegex, '$1:')
+	return templateCode.replace(DOUBLE_QUOTE_REGEX, '$1:')
 }
 
 interface PathOperation {

package/src/openAPITools/typeGenerator.ts

@@ -1,21 +1,38 @@
 import type { SchemasObject } from './openApiTypes'
-import { formatType, formatVarType } from './utils'
+import { formatType, formatVarType, schemaToType } from './utils'
 
 export function generateTypes(schemas: SchemasObject): string {
-	return Object.entries(schemas).map(([typeName, schema]) => {
-		typeName = formatType(typeName)
+	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`
-		}
-		if (!schema.properties) return ''
+			if (schema.enum) {
+				return `export type ${typeName} = ${schema.enum.map((item: string) => `'${item}'`).join(' | ')};\n`
+			}
 
-		const properties = Object.entries(schema.properties).map(([key, value]) => {
-			const varType = formatVarType({ varName: key, schema: value })
+			if (schema.type === 'array' && schema.items) {
+				return `export type ${typeName} = ${schemaToType(schema.items)}[];\n`
+			}
 
-			return `\t\t${varType}`
-		}).join(';\n ')
+			if (!schema.properties) {
+				// #region Debug
+				console.log('No properties found for schema:', typeName)
 
-		return `export type ${typeName} = {\n ${properties};\n };\n`
-	}).join('\n')
+				console.log(JSON.stringify({ typeName, schema }, null, 2))
+				// #endregion Debug
+
+				return ''
+			}
+
+			const properties = Object.entries(schema.properties)
+				.map(([key, value]) => {
+					const varType = formatVarType({ varName: key, schema: value })
+
+					return `\t\t${varType}`
+				})
+				.join(';\n ')
+
+			return `export type ${typeName} = {\n ${properties};\n };\n`
+		})
+		.join('\n')
 }