@bagelink/sdk 0.0.631 → 0.0.635

package/bin/index.ts

@@ -1,15 +1,16 @@
 #!/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 proc = _require('process') as typeof import('process')
+
 const cwd = proc.cwd()
 const env = loadEnv('', cwd)
 
@@ -19,38 +20,78 @@ 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 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 formatter = await eslint.loadFormatter('stylish')
+	// const rulesMeta = eslint.getRulesMetaForResults(results)
+	// await formatter.format(results, { cwd, rulesMeta })
+	// const resultText =
+	// console.log(resultText)
+}
 
 export async function loadTypes() {
-	const { types, code } = await openAPI(
-		baseURL || '',
-		'import.meta.env.VITE_BAGEL_BASE_URL'
-	)
+	try {
+		const { types, code } = await openAPI(
+			baseURL || '',
+			'import.meta.env.VITE_BAGEL_BASE_URL'
+		)
+
+		if (!fs.existsSync(bagelinkDir)) fs.mkdirSync(bagelinkDir)
 
-	if (!fs.existsSync(bagelinkDir)) fs.mkdirSync(bagelinkDir)
+		const typesPath = join(bagelinkDir, 'types.d.ts')
+		await formatAndWriteCode(typesPath, types)
 
-	const typesPath = join(bagelinkDir, 'types.d.ts')
-	fs.writeFileSync(typesPath, await prettier.format(types, { parser: 'typescript' }))
+		const apiPath = join(bagelinkDir, 'api.ts')
+		await formatAndWriteCode(apiPath, code)
 
-	const apiPath = join(bagelinkDir, 'api.ts')
-	fs.writeFileSync(apiPath, await prettier.format(code, { parser: 'typescript' }))
+		if (withAuth) {
+			const authCode = fs.readFileSync(
+				join(cwd, 'auth.ts'),
+				'utf-8'
+			).replace(
+				'',
+				''
+			)
+			const authPath = join(bagelinkDir, 'auth.ts')
+			await formatAndWriteCode(authPath, authCode)
+		}
 
-	if (withAuth) {
-		const authCode = fs.readFileSync(join(cwd, 'auth.txt'), 'utf-8')
-		const authPath = join(bagelinkDir, 'auth.ts')
-		fs.writeFileSync(authPath, authCode)
+		await runEsLintOnDir(bagelinkDir)
+	} catch (error) {
+		proc.exitCode = 1
+		console.error(error)
 	}
 }
 
-loadTypes().catch(console.error)
+loadTypes().catch((error: unknown) => {
+	proc.exitCode = 1
+	console.error(error)
+})

package/package.json

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