@bagelink/sdk 0.0.747 → 0.0.751

package/bin/utils.ts

@@ -1,9 +1,9 @@
 import fs from 'node:fs'
 
-import { join } from 'node:path'
 import { createRequire } from 'node:module'
-import * as prettier from 'prettier'
+import { join } from 'node:path'
 import { ESLint } from 'eslint'
+import * as prettier from 'prettier'
 import { loadEnv } from 'vite'
 
 const _require = createRequire(import.meta.url)

package/dist/index.cjs

@@ -68,26 +68,6 @@ function cleanPath(path) {
   return path.split("/").filter((p) => p && !p.match(/\{|\}/)).join("/");
 }
 
-function generateTypes(schemas) {
-  return Object.entries(schemas).map(([typeName, schema]) => {
-    typeName = formatType(typeName);
-    if (schema.enum) {
-      return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
-`;
-    }
-    if (!schema.properties)
-      return "";
-    const properties = Object.entries(schema.properties).map(([key, value]) => {
-      const varType = formatVarType(key, value);
-      return `		${varType}`;
-    }).join(";\n ");
-    return `export type ${typeName} = {
- ${properties};
- };
-`;
-  }).join("\n");
-}
-
 const allTypes = [];
 function collectTypeForImportStatement(typeName) {
   typeName = typeName.trim().replace("[]", "");
@@ -281,6 +261,26 @@ function generateFunctions(paths, baseUrl) {
   return tsString;
 }
 
+function generateTypes(schemas) {
+  return Object.entries(schemas).map(([typeName, schema]) => {
+    typeName = formatType(typeName);
+    if (schema.enum) {
+      return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
+`;
+    }
+    if (!schema.properties)
+      return "";
+    const properties = Object.entries(schema.properties).map(([key, value]) => {
+      const varType = formatVarType(key, value);
+      return `		${varType}`;
+    }).join(";\n ");
+    return `export type ${typeName} = {
+ ${properties};
+ };
+`;
+  }).join("\n");
+}
+
 const index = async (openApiUrl, baseUrl) => {
   try {
     const { data: openApi } = await axios__default.get(openApiUrl);

package/dist/index.mjs

@@ -62,26 +62,6 @@ function cleanPath(path) {
   return path.split("/").filter((p) => p && !p.match(/\{|\}/)).join("/");
 }
 
-function generateTypes(schemas) {
-  return Object.entries(schemas).map(([typeName, schema]) => {
-    typeName = formatType(typeName);
-    if (schema.enum) {
-      return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
-`;
-    }
-    if (!schema.properties)
-      return "";
-    const properties = Object.entries(schema.properties).map(([key, value]) => {
-      const varType = formatVarType(key, value);
-      return `		${varType}`;
-    }).join(";\n ");
-    return `export type ${typeName} = {
- ${properties};
- };
-`;
-  }).join("\n");
-}
-
 const allTypes = [];
 function collectTypeForImportStatement(typeName) {
   typeName = typeName.trim().replace("[]", "");
@@ -275,6 +255,26 @@ function generateFunctions(paths, baseUrl) {
   return tsString;
 }
 
+function generateTypes(schemas) {
+  return Object.entries(schemas).map(([typeName, schema]) => {
+    typeName = formatType(typeName);
+    if (schema.enum) {
+      return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
+`;
+    }
+    if (!schema.properties)
+      return "";
+    const properties = Object.entries(schema.properties).map(([key, value]) => {
+      const varType = formatVarType(key, value);
+      return `		${varType}`;
+    }).join(";\n ");
+    return `export type ${typeName} = {
+ ${properties};
+ };
+`;
+  }).join("\n");
+}
+
 const index = async (openApiUrl, baseUrl) => {
   try {
     const { data: openApi } = await axios$1.get(openApiUrl);

package/package.json

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

package/src/openAPITools/functionGenerator.ts

@@ -1,12 +1,3 @@
-import type {
-	OperationObject,
-	ParameterObject,
-	PathsObject,
-	RequestBodyObject,
-	ResponseObject,
-	ResponsesObject,
-} from './openApiTypes'
-
 import {
 	cleanPath,
 	formatType,
@@ -16,6 +7,15 @@ import {
 	toPascalCase,
 } from './utils'
 
+import type {
+	OperationObject,
+	ParameterObject,
+	PathsObject,
+	RequestBodyObject,
+	ResponseObject,
+	ResponsesObject,
+} from './openApiTypes'
+
 const allTypes: string[] = []
 
 function collectTypeForImportStatement(typeName: string) {
@@ -124,7 +124,8 @@ function combineAllParams(parameters: { params?: string }, requestBodyParam: str
 	if (requestBodyParam) allParamsArray.push(requestBodyParam.trim())
 
 	allParamsArray = allParamsArray
-		.filter(p => p).sort((a, b) => (a.includes('?') ? 1 : -1) - (b.includes('?') ? 1 : -1))
+		.filter(p => p)
+		.sort((a, b) => (a.includes('?') ? 1 : -1) - (b.includes('?') ? 1 : -1))
 
 	return allParamsArray.join(', ')
 }

package/src/openAPITools/index.ts

@@ -1,7 +1,7 @@
 import axios from 'axios'
-import type { OpenAPIDocument } from './openApiTypes'
-import { generateTypes } from './typeGenerator'
 import { generateFunctions } from './functionGenerator'
+import { generateTypes } from './typeGenerator'
+import type { OpenAPIDocument } from './openApiTypes'
 
 interface OpenAPIResponse {
 	types: string