@bagelink/sdk 0.0.1129 → 0.0.1131

package/dist/index.cjs

@@ -18,24 +18,20 @@ function formatType(typeName) {
 }
 function resolveReference(ref) {
   const t = ref.split("/").pop();
-  if (!t)
-    return "any";
+  if (!t) return "any";
   return formatType(t);
 }
 function schemaToType(schema) {
-  if (!schema)
-    return "any";
+  if (!schema) return "any";
   if (schema.anyOf) {
     let _t = schema.anyOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" | ");
-    if (_t === "" || _t === "null")
-      _t = "any";
+    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);
+  if (schema.$ref) return resolveReference(schema.$ref);
   switch (schema.type) {
     case "object":
       return "{ [key: string]: any }";
@@ -53,7 +49,7 @@ function schemaToType(schema) {
       return "undefined";
     case "null":
       return "null";
-    case void 0:
+    case undefined:
       return "any";
     default:
       console.log("Unknown type", schema.type);
@@ -65,7 +61,7 @@ function isOptional(schema) {
   const splitType = type.split(/\s+\|\s+/);
   const includesNull = splitType.includes("null");
   const includesUndefined = splitType.includes("undefined");
-  return includesNull || includesUndefined || schema.default !== void 0;
+  return includesNull || includesUndefined || schema.default !== undefined;
 }
 function cleanOptionals(str) {
   return str.split(" | ").filter((t) => t !== "null" && t !== "undefined").join(" | ");
@@ -87,8 +83,7 @@ function formatVarType({
     }
   }
   let optionalStr = !required && isOptional(schema) ? "?" : "";
-  if (defaultStr)
-    optionalStr = "";
+  if (defaultStr) optionalStr = "";
   return `${varName}${optionalStr}: ${type}${defaultStr}`;
 }
 function cleanPath(path) {
@@ -117,22 +112,22 @@ function collectTypeForImportStatement(typeName) {
   }
   const isPrimitive = primitiveTypes.includes(typeName);
   typeName = formatType(typeName);
-  if (!typeName || isPrimitive)
-    return;
-  if (!allTypes.includes(typeName))
-    allTypes.push(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);
+  if (!mediaTypeObject || !mediaTypeObject.schema) return;
+  const responseType = schemaToTypeWithCollection(mediaTypeObject.schema);
   return responseType;
 }
 function generateResponseType(responses) {
-  if (!responses)
-    return "";
+  if (!responses) return "";
   const types = [];
   for (const [statusCode, response] of Object.entries(responses)) {
     if (statusCode.startsWith("2")) {
@@ -145,8 +140,7 @@ function generateResponseType(responses) {
   return types.join(" | ");
 }
 function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr, parameters, requestBodyPayload) {
-  if (allParams === "undefined")
-    allParams = "";
+  if (allParams === "undefined") allParams = "";
   let axiosFunction = `async (${allParams})${responseTypeStr} => {`;
   if (requestBodyPayload === "formData") {
     const paramStr = parameters?.config?.params ? `params: {${parameters.config.params}}` : "";
@@ -206,14 +200,12 @@ function combineAllParams(parameters, requestBodyParam) {
   let allParamsArray = [];
   if (parameters && parameters.params)
     allParamsArray = parameters.params.split(",").map((p) => p.trim());
-  if (requestBodyParam)
-    allParamsArray.push(requestBodyParam.trim());
+  if (requestBodyParam) allParamsArray.push(requestBodyParam.trim());
   allParamsArray = allParamsArray.filter((p) => p).sort((a, b) => (a.includes("?") ? 1 : -1) - (b.includes("?") ? 1 : -1));
   return allParamsArray.join(", ");
 }
 function generateFunctionParameters(params, isFileUpload = false) {
-  if (!params?.length)
-    return {};
+  if (!params?.length) return {};
   if (isFileUpload) {
     return {
       config: {
@@ -252,8 +244,7 @@ function generateFunctionParameters(params, isFileUpload = false) {
   };
 }
 function generateFunctionForOperation(method, path, operation) {
-  if (!operation)
-    return "";
+  if (!operation) return "";
   const isFileUpload = operation.requestBody?.content["multipart/form-data"]?.schema?.$ref?.includes("Body_upload_files");
   const parameters = generateFunctionParameters(
     operation.parameters,
@@ -275,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';
@@ -288,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 = [];
@@ -335,8 +326,7 @@ function generateFunctions(paths, baseUrl) {
     const splitPath = path.split("/").filter((p) => p && !/\{|\}/.test(p));
     splitPath.reduce((acc, key, index, array) => {
       const objFuncKey = toCamelCase(key);
-      if (!objFuncKey)
-        return acc;
+      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) {
         const method = methods[0];
@@ -351,7 +341,7 @@ function generateFunctions(paths, baseUrl) {
     }, body);
   }
   for (const [parent, object] of Object.entries(body)) {
-    tsString += `export const ${parent} = ${JSON.stringify(object, void 0, 2)};
+    tsString += `export const ${parent} = ${JSON.stringify(object, undefined, 2)};
 `;
   }
   Object.entries(functionsInventory).forEach(([key, value]) => {
@@ -368,8 +358,15 @@ function generateTypes(schemas) {
       return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
 `;
     }
-    if (!schema.properties)
+    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}`;
@@ -386,12 +383,10 @@ const index = async (openApiUrl, baseUrl) => {
   try {
     const { data: openApi } = await axios__default.get(openApiUrl, { headers: basicAuthHeader });
     const schemas = openApi.components?.schemas;
-    if (!schemas)
-      throw new Error("No schemas found in OpenAPI document");
+    if (!schemas) throw new Error("No schemas found in OpenAPI document");
     const types = generateTypes(schemas);
     const { paths } = openApi;
-    if (!paths)
-      throw new Error("No paths found in OpenAPI document");
+    if (!paths) throw new Error("No paths found in OpenAPI document");
     const code = generateFunctions(paths, baseUrl);
     return { types, code };
   } catch (error) {
@@ -399,28 +394,21 @@ const index = async (openApiUrl, baseUrl) => {
   }
 };
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 const axios = axios__default.create({
   withCredentials: true
 });
 class DataRequest {
+  data_table;
+  bagel;
+  itemID;
+  _filter = {};
   constructor(table, bagel) {
-    __publicField(this, "data_table");
-    __publicField(this, "bagel");
-    __publicField(this, "itemID");
-    __publicField(this, "_filter", {});
     this.data_table = table;
     this.bagel = bagel;
     this.itemID = "";
   }
   async post(item) {
-    if (!this.data_table)
-      throw new Error("Data table not set");
+    if (!this.data_table) throw new Error("Data table not set");
     const { data } = await axios.post(`/data/${this.data_table}`, item);
     return data;
   }
@@ -429,8 +417,7 @@ class DataRequest {
     return this;
   }
   async get() {
-    if (!this.data_table)
-      throw new Error("Data table not set");
+    if (!this.data_table) throw new Error("Data table not set");
     const filterStr = Object.keys(this._filter).length > 0 ? `?filter={${Object.entries(this._filter).map(([k, v]) => `${k}:${v}`).join(",")}}` : "";
     const url = `/data/${this.data_table}${this.itemID ? `/${this.itemID}` : ""}${filterStr}`;
     try {
@@ -439,7 +426,7 @@ class DataRequest {
     } catch (err) {
       console.log(err);
       this.bagel.onError?.(err);
-      return void 0;
+      return undefined;
     }
   }
   item(id) {
@@ -447,8 +434,7 @@ class DataRequest {
     return this;
   }
   async delete() {
-    if (!this.data_table)
-      throw new Error("Data table not set");
+    if (!this.data_table) throw new Error("Data table not set");
     const { data } = await axios.delete(
       `/data/${this.data_table}/${this.itemID}`
     );
@@ -456,10 +442,8 @@ class DataRequest {
   }
   async put(updatedItem) {
     const { data_table, itemID } = this;
-    if (!data_table)
-      throw new Error("Data table not set");
-    if (!itemID)
-      throw new Error("Item ID not set");
+    if (!data_table) throw new Error("Data table not set");
+    if (!itemID) throw new Error("Item ID not set");
     const { data } = await axios.put(
       `/data/${data_table}/${itemID}`,
       updatedItem
@@ -477,9 +461,9 @@ function responses(key) {
 class BagelAuth {
   constructor(bagel) {
     this.bagel = bagel;
-    __publicField(this, "user");
     this.bagel = bagel;
   }
+  user = undefined;
   async validateUser() {
     try {
       const { data: usr } = await axios.get("/users/me", {
@@ -527,7 +511,7 @@ class BagelAuth {
       this.bagel.onError?.(err);
       console.log(err);
     }
-    this.user = void 0;
+    this.user = undefined;
   }
   async acceptInvite(token, user) {
     await axios.post(`/auth/accept-invite/${token}`, user);
@@ -545,12 +529,10 @@ class BagelAuth {
   }
 }
 class Bagel {
+  host;
+  fileBaseUrl;
+  onError;
   constructor({ host, fileBaseUrl, onError }) {
-    __publicField(this, "host");
-    __publicField(this, "fileBaseUrl");
-    __publicField(this, "onError");
-    __publicField(this, "read_table");
-    __publicField(this, "auth", new BagelAuth(this));
     this.host = host?.replace(/\/$/, "");
     this.fileBaseUrl = fileBaseUrl?.replace(/\/$/, "");
     if (!this.host) {
@@ -559,9 +541,11 @@ class Bagel {
     axios.defaults.baseURL = this.host;
     this.onError = onError;
   }
+  read_table = undefined;
   data(table) {
     return new DataRequest(table, this);
   }
+  auth = new BagelAuth(this);
   _endpointCleaner(endpoint) {
     const url = `${endpoint.replace(/^\//, "").replaceAll(/\/$/g, "")}`;
     return url;
@@ -576,12 +560,10 @@ class Bagel {
   async get(endpoint, query) {
     this._setAuthorization();
     endpoint = this._endpointCleaner(endpoint);
-    if (/undefined|null/.test(endpoint))
-      throw new Error(`Invalid endpoint: ${endpoint}`);
+    if (/undefined|null/.test(endpoint)) throw new Error(`Invalid endpoint: ${endpoint}`);
     if (query) {
       const queryParams = Object.entries(query).filter(([_, value]) => !!value).map(([key, value]) => `${key}=${value}`).join("&");
-      if (queryParams)
-        endpoint = `${endpoint}?${queryParams}`;
+      if (queryParams) endpoint = `${endpoint}?${queryParams}`;
     }
     const url = `/${endpoint}`;
     return axios.get(url).then(({ data }) => data).catch((err) => {
@@ -631,8 +613,7 @@ class Bagel {
     const formData = new FormData();
     formData.append("file", file);
     let url = "/static_files/upload";
-    if (options?.topic)
-      url = `/static_files/upload?topic=${options.topic}`;
+    if (options?.topic) url = `/static_files/upload?topic=${options.topic}`;
     const { data } = await axios.post(url, formData, {
       headers: {
         "Content-Type": "multipart/form-data"

package/dist/index.mjs

@@ -12,24 +12,20 @@ function formatType(typeName) {
 }
 function resolveReference(ref) {
   const t = ref.split("/").pop();
-  if (!t)
-    return "any";
+  if (!t) return "any";
   return formatType(t);
 }
 function schemaToType(schema) {
-  if (!schema)
-    return "any";
+  if (!schema) return "any";
   if (schema.anyOf) {
     let _t = schema.anyOf.map((s) => schemaToType(s)).filter((p) => p !== "any").join(" | ");
-    if (_t === "" || _t === "null")
-      _t = "any";
+    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);
+  if (schema.$ref) return resolveReference(schema.$ref);
   switch (schema.type) {
     case "object":
       return "{ [key: string]: any }";
@@ -47,7 +43,7 @@ function schemaToType(schema) {
       return "undefined";
     case "null":
       return "null";
-    case void 0:
+    case undefined:
       return "any";
     default:
       console.log("Unknown type", schema.type);
@@ -59,7 +55,7 @@ function isOptional(schema) {
   const splitType = type.split(/\s+\|\s+/);
   const includesNull = splitType.includes("null");
   const includesUndefined = splitType.includes("undefined");
-  return includesNull || includesUndefined || schema.default !== void 0;
+  return includesNull || includesUndefined || schema.default !== undefined;
 }
 function cleanOptionals(str) {
   return str.split(" | ").filter((t) => t !== "null" && t !== "undefined").join(" | ");
@@ -81,8 +77,7 @@ function formatVarType({
     }
   }
   let optionalStr = !required && isOptional(schema) ? "?" : "";
-  if (defaultStr)
-    optionalStr = "";
+  if (defaultStr) optionalStr = "";
   return `${varName}${optionalStr}: ${type}${defaultStr}`;
 }
 function cleanPath(path) {
@@ -111,22 +106,22 @@ function collectTypeForImportStatement(typeName) {
   }
   const isPrimitive = primitiveTypes.includes(typeName);
   typeName = formatType(typeName);
-  if (!typeName || isPrimitive)
-    return;
-  if (!allTypes.includes(typeName))
-    allTypes.push(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);
+  if (!mediaTypeObject || !mediaTypeObject.schema) return;
+  const responseType = schemaToTypeWithCollection(mediaTypeObject.schema);
   return responseType;
 }
 function generateResponseType(responses) {
-  if (!responses)
-    return "";
+  if (!responses) return "";
   const types = [];
   for (const [statusCode, response] of Object.entries(responses)) {
     if (statusCode.startsWith("2")) {
@@ -139,8 +134,7 @@ function generateResponseType(responses) {
   return types.join(" | ");
 }
 function generateAxiosFunction(method, formattedPath, allParams, responseTypeStr, parameters, requestBodyPayload) {
-  if (allParams === "undefined")
-    allParams = "";
+  if (allParams === "undefined") allParams = "";
   let axiosFunction = `async (${allParams})${responseTypeStr} => {`;
   if (requestBodyPayload === "formData") {
     const paramStr = parameters?.config?.params ? `params: {${parameters.config.params}}` : "";
@@ -200,14 +194,12 @@ function combineAllParams(parameters, requestBodyParam) {
   let allParamsArray = [];
   if (parameters && parameters.params)
     allParamsArray = parameters.params.split(",").map((p) => p.trim());
-  if (requestBodyParam)
-    allParamsArray.push(requestBodyParam.trim());
+  if (requestBodyParam) allParamsArray.push(requestBodyParam.trim());
   allParamsArray = allParamsArray.filter((p) => p).sort((a, b) => (a.includes("?") ? 1 : -1) - (b.includes("?") ? 1 : -1));
   return allParamsArray.join(", ");
 }
 function generateFunctionParameters(params, isFileUpload = false) {
-  if (!params?.length)
-    return {};
+  if (!params?.length) return {};
   if (isFileUpload) {
     return {
       config: {
@@ -246,8 +238,7 @@ function generateFunctionParameters(params, isFileUpload = false) {
   };
 }
 function generateFunctionForOperation(method, path, operation) {
-  if (!operation)
-    return "";
+  if (!operation) return "";
   const isFileUpload = operation.requestBody?.content["multipart/form-data"]?.schema?.$ref?.includes("Body_upload_files");
   const parameters = generateFunctionParameters(
     operation.parameters,
@@ -269,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';
@@ -282,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 = [];
@@ -329,8 +320,7 @@ function generateFunctions(paths, baseUrl) {
     const splitPath = path.split("/").filter((p) => p && !/\{|\}/.test(p));
     splitPath.reduce((acc, key, index, array) => {
       const objFuncKey = toCamelCase(key);
-      if (!objFuncKey)
-        return acc;
+      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) {
         const method = methods[0];
@@ -345,7 +335,7 @@ function generateFunctions(paths, baseUrl) {
     }, body);
   }
   for (const [parent, object] of Object.entries(body)) {
-    tsString += `export const ${parent} = ${JSON.stringify(object, void 0, 2)};
+    tsString += `export const ${parent} = ${JSON.stringify(object, undefined, 2)};
 `;
   }
   Object.entries(functionsInventory).forEach(([key, value]) => {
@@ -362,8 +352,15 @@ function generateTypes(schemas) {
       return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
 `;
     }
-    if (!schema.properties)
+    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}`;
@@ -380,12 +377,10 @@ const index = async (openApiUrl, baseUrl) => {
   try {
     const { data: openApi } = await axios$1.get(openApiUrl, { headers: basicAuthHeader });
     const schemas = openApi.components?.schemas;
-    if (!schemas)
-      throw new Error("No schemas found in OpenAPI document");
+    if (!schemas) throw new Error("No schemas found in OpenAPI document");
     const types = generateTypes(schemas);
     const { paths } = openApi;
-    if (!paths)
-      throw new Error("No paths found in OpenAPI document");
+    if (!paths) throw new Error("No paths found in OpenAPI document");
     const code = generateFunctions(paths, baseUrl);
     return { types, code };
   } catch (error) {
@@ -393,28 +388,21 @@ const index = async (openApiUrl, baseUrl) => {
   }
 };
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 const axios = axios$1.create({
   withCredentials: true
 });
 class DataRequest {
+  data_table;
+  bagel;
+  itemID;
+  _filter = {};
   constructor(table, bagel) {
-    __publicField(this, "data_table");
-    __publicField(this, "bagel");
-    __publicField(this, "itemID");
-    __publicField(this, "_filter", {});
     this.data_table = table;
     this.bagel = bagel;
     this.itemID = "";
   }
   async post(item) {
-    if (!this.data_table)
-      throw new Error("Data table not set");
+    if (!this.data_table) throw new Error("Data table not set");
     const { data } = await axios.post(`/data/${this.data_table}`, item);
     return data;
   }
@@ -423,8 +411,7 @@ class DataRequest {
     return this;
   }
   async get() {
-    if (!this.data_table)
-      throw new Error("Data table not set");
+    if (!this.data_table) throw new Error("Data table not set");
     const filterStr = Object.keys(this._filter).length > 0 ? `?filter={${Object.entries(this._filter).map(([k, v]) => `${k}:${v}`).join(",")}}` : "";
     const url = `/data/${this.data_table}${this.itemID ? `/${this.itemID}` : ""}${filterStr}`;
     try {
@@ -433,7 +420,7 @@ class DataRequest {
     } catch (err) {
       console.log(err);
       this.bagel.onError?.(err);
-      return void 0;
+      return undefined;
     }
   }
   item(id) {
@@ -441,8 +428,7 @@ class DataRequest {
     return this;
   }
   async delete() {
-    if (!this.data_table)
-      throw new Error("Data table not set");
+    if (!this.data_table) throw new Error("Data table not set");
     const { data } = await axios.delete(
       `/data/${this.data_table}/${this.itemID}`
     );
@@ -450,10 +436,8 @@ class DataRequest {
   }
   async put(updatedItem) {
     const { data_table, itemID } = this;
-    if (!data_table)
-      throw new Error("Data table not set");
-    if (!itemID)
-      throw new Error("Item ID not set");
+    if (!data_table) throw new Error("Data table not set");
+    if (!itemID) throw new Error("Item ID not set");
     const { data } = await axios.put(
       `/data/${data_table}/${itemID}`,
       updatedItem
@@ -471,9 +455,9 @@ function responses(key) {
 class BagelAuth {
   constructor(bagel) {
     this.bagel = bagel;
-    __publicField(this, "user");
     this.bagel = bagel;
   }
+  user = undefined;
   async validateUser() {
     try {
       const { data: usr } = await axios.get("/users/me", {
@@ -521,7 +505,7 @@ class BagelAuth {
       this.bagel.onError?.(err);
       console.log(err);
     }
-    this.user = void 0;
+    this.user = undefined;
   }
   async acceptInvite(token, user) {
     await axios.post(`/auth/accept-invite/${token}`, user);
@@ -539,12 +523,10 @@ class BagelAuth {
   }
 }
 class Bagel {
+  host;
+  fileBaseUrl;
+  onError;
   constructor({ host, fileBaseUrl, onError }) {
-    __publicField(this, "host");
-    __publicField(this, "fileBaseUrl");
-    __publicField(this, "onError");
-    __publicField(this, "read_table");
-    __publicField(this, "auth", new BagelAuth(this));
     this.host = host?.replace(/\/$/, "");
     this.fileBaseUrl = fileBaseUrl?.replace(/\/$/, "");
     if (!this.host) {
@@ -553,9 +535,11 @@ class Bagel {
     axios.defaults.baseURL = this.host;
     this.onError = onError;
   }
+  read_table = undefined;
   data(table) {
     return new DataRequest(table, this);
   }
+  auth = new BagelAuth(this);
   _endpointCleaner(endpoint) {
     const url = `${endpoint.replace(/^\//, "").replaceAll(/\/$/g, "")}`;
     return url;
@@ -570,12 +554,10 @@ class Bagel {
   async get(endpoint, query) {
     this._setAuthorization();
     endpoint = this._endpointCleaner(endpoint);
-    if (/undefined|null/.test(endpoint))
-      throw new Error(`Invalid endpoint: ${endpoint}`);
+    if (/undefined|null/.test(endpoint)) throw new Error(`Invalid endpoint: ${endpoint}`);
     if (query) {
       const queryParams = Object.entries(query).filter(([_, value]) => !!value).map(([key, value]) => `${key}=${value}`).join("&");
-      if (queryParams)
-        endpoint = `${endpoint}?${queryParams}`;
+      if (queryParams) endpoint = `${endpoint}?${queryParams}`;
     }
     const url = `/${endpoint}`;
     return axios.get(url).then(({ data }) => data).catch((err) => {
@@ -625,8 +607,7 @@ class Bagel {
     const formData = new FormData();
     formData.append("file", file);
     let url = "/static_files/upload";
-    if (options?.topic)
-      url = `/static_files/upload?topic=${options.topic}`;
+    if (options?.topic) url = `/static_files/upload?topic=${options.topic}`;
     const { data } = await axios.post(url, formData, {
       headers: {
         "Content-Type": "multipart/form-data"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/sdk",
   "type": "module",
-  "version": "0.0.1129",
+  "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')
 }