@bagelink/sdk 0.0.696 → 0.0.702

package/bin/index.ts

@@ -2,58 +2,14 @@
 
 import fs from 'node:fs'
 import { join } from 'node:path'
-import { createRequire } from 'node:module'
-import * as prettier from 'prettier'
-import { ESLint } from 'eslint'
-import { loadEnv } from 'vite'
 import { openAPI } from '@bagelink/sdk'
+import { formatAndWriteCode, getKwargs, handleAuthCode, runEsLintOnDir } from './utils'
 
-const _require = createRequire(import.meta.url)
-const proc = _require('process') as typeof import('process')
-
-const cwd = proc.cwd()
-const env = loadEnv('', cwd)
-
-if (!env.VITE_BAGEL_BASE_URL) {
-	throw new Error('VITE_BAGEL_BASE_URL is not defined')
-}
-
-const baseURL = `${env.VITE_BAGEL_BASE_URL}/openapi.json`
-
-const [_, __, dirFlag, withAuthArg] = proc.argv as Partial<string[]>
-
-const withAuth = withAuthArg === '--auth'
-
-if (dirFlag !== undefined) {
-	console.log(`using passed in dir to generate sdk client: ${dirFlag}`)
-} else {
-	console.log(`using default dir to generate sdk client: .bagelink`)
-	console.log(`to use a different dir, pass it as an argument to the command`)
-}
-
-const bagelinkDir = join(cwd, dirFlag ?? '.bagelink')
-
-async function formatAndWriteCode(outPath: string, code: string) {
-	const prettyCode = await prettier.format(code, { parser: 'typescript' })
-	fs.writeFileSync(outPath, prettyCode)
-}
-
-async function runEsLintOnDir(dir: string) {
-	// ! only run if eslint.config.js exists
-	if (!fs.existsSync(join(cwd, 'eslint.config.js'))) {
-		console.log('no eslint.config.js found, skipping eslint')
-		return
-	}
-
-	const eslint = new ESLint({ fix: true, overrideConfigFile: join(cwd, 'eslint.config.js'), cwd })
-	const results = await eslint.lintFiles(`${dir}/**/*.ts`)
-
-	await ESLint.outputFixes(results)
-}
+const { bagelinkDir, withAuth, openApiUrl, proc } = getKwargs()
 
 export async function loadTypes() {
 	const { types, code } = await openAPI(
-		baseURL || '',
+		openApiUrl,
 		'import.meta.env.VITE_BAGEL_BASE_URL'
 	)
 
@@ -65,17 +21,7 @@ export async function loadTypes() {
 	const apiPath = join(bagelinkDir, 'api.ts')
 	await formatAndWriteCode(apiPath, code)
 
-	if (withAuth) {
-		const authCode = fs.readFileSync(
-			join(__dirname, 'auth.ts'),
-			'utf-8'
-		).replace(
-			'// @ts-expect-error - required for axios to work',
-			''
-		)
-		const authPath = join(bagelinkDir, 'auth.ts')
-		await formatAndWriteCode(authPath, authCode)
-	}
+	await handleAuthCode(withAuth, bagelinkDir)
 
 	await runEsLintOnDir(bagelinkDir)
 

package/dist/index.cjs

@@ -247,7 +247,7 @@ function handlePathSegment(path, operation, existingObj = null) {
   }
   return { ...obj, ...existingObj };
 }
-function generateFunctions(paths, baseURL) {
+function generateFunctions(paths, baseUrl) {
   let tsString = "";
   const body = {};
   const allPathsClean = Object.keys(paths).map(cleanPath);
@@ -277,11 +277,11 @@ function generateFunctions(paths, baseURL) {
   Object.entries(functionsInventory).forEach(([key, value]) => {
     tsString = tsString.replace(`"${key}"`, value);
   });
-  tsString = fileTemplate(tsString, allTypes, baseURL);
+  tsString = fileTemplate(tsString, allTypes, baseUrl);
   return tsString;
 }
 
-const index = async (openApiUrl, baseURL) => {
+const index = async (openApiUrl, baseUrl) => {
   try {
     const { data: openApi } = await axios__default.get(openApiUrl);
     const schemas = openApi.components?.schemas;
@@ -291,7 +291,7 @@ const index = async (openApiUrl, baseURL) => {
     const { paths } = openApi;
     if (!paths)
       throw new Error("No paths found in OpenAPI document");
-    const code = generateFunctions(paths, baseURL);
+    const code = generateFunctions(paths, baseUrl);
     return { types, code };
   } catch (error) {
     throw new Error(error);

package/dist/index.d.cts

@@ -2,7 +2,7 @@ interface OpenAPIResponse {
     types: string;
     code: string;
 }
-declare const _default: (openApiUrl: string, baseURL: string) => Promise<OpenAPIResponse>;
+declare const _default: (openApiUrl: string, baseUrl: string) => Promise<OpenAPIResponse>;
 
 type Tables = '';
 type TableToTypeMapping = Record<Tables, any>;

package/dist/index.d.mts

@@ -2,7 +2,7 @@ interface OpenAPIResponse {
     types: string;
     code: string;
 }
-declare const _default: (openApiUrl: string, baseURL: string) => Promise<OpenAPIResponse>;
+declare const _default: (openApiUrl: string, baseUrl: string) => Promise<OpenAPIResponse>;
 
 type Tables = '';
 type TableToTypeMapping = Record<Tables, any>;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ interface OpenAPIResponse {
     types: string;
     code: string;
 }
-declare const _default: (openApiUrl: string, baseURL: string) => Promise<OpenAPIResponse>;
+declare const _default: (openApiUrl: string, baseUrl: string) => Promise<OpenAPIResponse>;
 
 type Tables = '';
 type TableToTypeMapping = Record<Tables, any>;

package/dist/index.mjs

@@ -241,7 +241,7 @@ function handlePathSegment(path, operation, existingObj = null) {
   }
   return { ...obj, ...existingObj };
 }
-function generateFunctions(paths, baseURL) {
+function generateFunctions(paths, baseUrl) {
   let tsString = "";
   const body = {};
   const allPathsClean = Object.keys(paths).map(cleanPath);
@@ -271,11 +271,11 @@ function generateFunctions(paths, baseURL) {
   Object.entries(functionsInventory).forEach(([key, value]) => {
     tsString = tsString.replace(`"${key}"`, value);
   });
-  tsString = fileTemplate(tsString, allTypes, baseURL);
+  tsString = fileTemplate(tsString, allTypes, baseUrl);
   return tsString;
 }
 
-const index = async (openApiUrl, baseURL) => {
+const index = async (openApiUrl, baseUrl) => {
   try {
     const { data: openApi } = await axios$1.get(openApiUrl);
     const schemas = openApi.components?.schemas;
@@ -285,7 +285,7 @@ const index = async (openApiUrl, baseURL) => {
     const { paths } = openApi;
     if (!paths)
       throw new Error("No paths found in OpenAPI document");
-    const code = generateFunctions(paths, baseURL);
+    const code = generateFunctions(paths, baseUrl);
     return { types, code };
   } catch (error) {
     throw new Error(error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/sdk",
   "type": "module",
-  "version": "0.0.696",
+  "version": "0.0.702",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Neveh Allon",
@@ -51,6 +51,12 @@
   "dependencies": {
     "axios": "^1.7.4"
   },
+  "devDependencies": {
+    "@apidevtools/swagger-parser": "^10.1.0",
+    "handlebars": "^4.7.8",
+    "openapi-zod-client": "^1.18.2",
+    "openapi3-ts": "^3.1.0"
+  },
   "scripts": {
     "dev": "unbuild --stub",
     "build": "unbuild",

package/src/openAPITools/functionGenerator.ts

@@ -218,7 +218,7 @@ function handlePathSegment(
 	return { ...obj, ...existingObj }
 }
 
-export function generateFunctions(paths: PathsObject, baseURL: string) {
+export function generateFunctions(paths: PathsObject, baseUrl: string) {
 	let tsString = ''
 	const body: Record<string, any> = {}
 	const allPathsClean = Object.keys(paths).map(cleanPath)
@@ -251,6 +251,6 @@ export function generateFunctions(paths: PathsObject, baseURL: string) {
 	Object.entries(functionsInventory).forEach(([key, value]) => {
 		tsString = tsString.replace(`"${key}"`, value)
 	})
-	tsString = fileTemplate(tsString, allTypes, baseURL)
+	tsString = fileTemplate(tsString, allTypes, baseUrl)
 	return tsString
 }

package/src/openAPITools/index.ts

@@ -8,7 +8,7 @@ interface OpenAPIResponse {
 	code: string
 }
 
-export default async (openApiUrl: string, baseURL: string): Promise<OpenAPIResponse> => {
+export default async (openApiUrl: string, baseUrl: string): Promise<OpenAPIResponse> => {
 	try {
 		const { data: openApi } = await axios.get<OpenAPIDocument>(openApiUrl)
 		const schemas = openApi.components?.schemas
@@ -17,7 +17,7 @@ export default async (openApiUrl: string, baseURL: string): Promise<OpenAPIRespo
 		// Generate Functions
 		const { paths } = openApi
 		if (!paths) throw new Error('No paths found in OpenAPI document')
-		const code = generateFunctions(paths, baseURL) // TODO baseURL should not be set here, but should be instatiated in runtime somehow
+		const code = generateFunctions(paths, baseUrl) // TODO baseURL should not be set here, but should be instatiated in runtime somehow
 		return { types, code }
 	} catch (error: any) {
 		throw new Error(error)

package/bin/auth.ts

@@ -1,47 +0,0 @@
-import type { AxiosInstance, AxiosResponse } from 'axios'
-// @ts-expect-error - required for axios to work
-import { axios } from './api'
-
-export interface Message {
-	message: string
-}
-
-export interface NewPassword {
-	token: string
-	new_password: string
-}
-const ax: AxiosInstance = axios
-
-ax.interceptors.request.use((config) => {
-	const token = localStorage.getItem('access_token')
-	if (token !== null) config.headers.Authorization = `Bearer ${token}`
-
-	const urlParams = new URLSearchParams(window.location.search)
-	const resetToken = urlParams.get('token')
-	if (resetToken !== null) config.data = { ...config.data, token: resetToken }
-	return config
-})
-
-export async function login(username: string, password: string) {
-	const formData = new FormData()
-	formData.append('username', username)
-	formData.append('password', password)
-	formData.append('scope', 'auth')
-	formData.append('grant_type', 'password')
-	const { data } = await ax.post('/auth/login', formData, {
-		headers: { 'withCredentials': true, 'Content-Type': 'multipart/form-data' },
-	})
-	localStorage.setItem('access_token', data.access_token)
-}
-export function logout() {
-	localStorage.removeItem('access_token')
-	window.location.reload()
-}
-export async function passwordRecovery(email?: string): Promise<AxiosResponse<Message>> {
-	return ax.post(`/auth/password-recovery/${email}`, {})
-}
-export async function resetPassword(
-	newPassword: Partial<NewPassword> & Pick<NewPassword, 'new_password'>
-): Promise<AxiosResponse<Record<string, any>>> {
-	return ax.post('/auth/reset-password', { new_password: newPassword })
-}