@bagelink/sdk 0.0.631 → 0.0.633

package/bin/index.ts

@@ -1,16 +1,17 @@
 #!/usr/bin/env node
 
 import fs from 'node:fs'
-import { createRequire } from 'node:module'
 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 * as prettier from 'prettier'
-
 const _require = createRequire(import.meta.url)
 const proc = _require('process')
-const cwd = proc.cwd()
+
+const cwd: string = proc.cwd()
 const env = loadEnv('', cwd)
 
 if (!env.VITE_BAGEL_BASE_URL) {
@@ -19,18 +20,30 @@ if (!env.VITE_BAGEL_BASE_URL) {
 
 const baseURL = `${env.VITE_BAGEL_BASE_URL}/openapi.json`
 
-const dirFlag = proc.argv[2]
+const [_, __, dirFlag, withAuthArg] = proc.argv as Partial<string[]>
 
-const withAuth = proc.argv[3] === '--auth'
+const withAuth = withAuthArg === '--auth'
 
-if (dirFlag) {
+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')
+const bagelinkDir = join(cwd, dirFlag ?? '.bagelink')
+
+async function formatCode(code: string) {
+	const prettyCode = await prettier.format(code, { parser: 'typescript' })
+
+	const eslint = new ESLint({ fix: true, overrideConfigFile: join(cwd, 'eslint.config.js') })
+	const results = await eslint.lintText(prettyCode)
+	const formatter = await eslint.loadFormatter('stylish')
+	const rulesMeta = eslint.getRulesMetaForResults(results)
+	const resultText = await formatter.format(results, { cwd, rulesMeta })
+
+	return resultText
+}
 
 export async function loadTypes() {
 	const { types, code } = await openAPI(
@@ -41,15 +54,21 @@ export async function loadTypes() {
 	if (!fs.existsSync(bagelinkDir)) fs.mkdirSync(bagelinkDir)
 
 	const typesPath = join(bagelinkDir, 'types.d.ts')
-	fs.writeFileSync(typesPath, await prettier.format(types, { parser: 'typescript' }))
+	fs.writeFileSync(typesPath, await formatCode(types))
 
 	const apiPath = join(bagelinkDir, 'api.ts')
-	fs.writeFileSync(apiPath, await prettier.format(code, { parser: 'typescript' }))
+	fs.writeFileSync(apiPath, await formatCode(code))
 
 	if (withAuth) {
-		const authCode = fs.readFileSync(join(cwd, 'auth.txt'), 'utf-8')
+		const authCode = fs.readFileSync(
+			join(cwd, 'auth.ts'),
+			'utf-8'
+		).replace(
+			'// @ts-expect-error - required for axios to work',
+			''
+		)
 		const authPath = join(bagelinkDir, 'auth.ts')
-		fs.writeFileSync(authPath, authCode)
+		fs.writeFileSync(authPath, await formatCode(authCode))
 	}
 }
 

package/package.json

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