@graphenedata/cli 0.0.4 → 0.0.6

package/cli.ts

@@ -5,10 +5,11 @@ import {printDiagnostics, printTable} from './printer.ts'
 import {analyze, getDiagnostics, loadWorkspace, toSql, type Query} from '../lang/core.ts'
 import fs from 'fs-extra'
 import path from 'path'
-import os from 'os'
 import {loadConfig} from '../lang/config.ts'
 import {runServeInBackground, stopGrapheneIfRunning} from './background.ts'
-import {getConnection} from './connections/index.ts'
+import {check} from './check.ts'
+import {runQuery} from './connections/index.ts'
+import {loginPkce} from './auth.ts'
 
 const program = new Command()
 
@@ -46,76 +47,45 @@ program
     let queries = analyze(gsql)
     if (!validQuery(queries)) return
     let sql = toSql(queries[0])
-    let connection = await getConnection()
-    let res = await connection.runQuery(sql)
+    let res = await runQuery(sql)
     printTable(res.rows)
   })
 
 program
   .command('serve')
   .description('Run the local server')
-  .option('--fg', 'Run the server in the foreground')
-  .action(async (options: {fg?: boolean}) => {
-    if (options.fg || process.env.DEBUG) {
-      let mod = await import('./serve2.ts') // load dynamically, so we're not pulling in a bunch of deps we might not need
-      await mod.serve2()
-    } else {
+  .option('--bg', 'Run the server in the background')
+  .action(async (options: {bg?: boolean}) => {
+    await stopGrapheneIfRunning()
+    if (options.bg) {
       await runServeInBackground()
       process.exit(0)
+    } else {
+      let mod = await import('./serve2.ts') // load dynamically, so we're not pulling in a bunch of deps we might not need
+      await mod.serve2()
     }
   })
 
-program
-  .command('stop')
+program.command('stop')
   .description('Stop the local server')
-  .action(async () => {
-    await stopGrapheneIfRunning(process.cwd())
-  })
+  .action(async () => { await stopGrapheneIfRunning() })
 
 program
   .command('check')
-  .description('Check the project for errors')
-  .action(async () => {
-    await loadWorkspace(process.cwd(), true)
-    analyze()
-    if (getDiagnostics().length) {
-      printDiagnostics(getDiagnostics())
-      process.exit(1)
-    }
-    console.log('No errors found 💎')
+  .description('Check the project for errors, optionally capturing a page screenshot')
+  .argument('[mdFile]', 'Markdown file to check (e.g., index.md)')
+  .option('-c, --chart <chartTitle>', 'Title of a specific chart to capture')
+  .action(async (mdArg: string | undefined, options: {chart?: string}) => {
+    let res = await check({mdArg, chart: options.chart})
+    process.exit(res ? 0 : 1) // import to call `exit`, bc if we started the server in the background, just returning won't actually exit the process.
   })
 
-program
-  .command('view')
-  .description('Capture a screenshot of a rendered markdown file')
-  .argument('<mdFile>', 'Markdown file to view (e.g., index.md)')
-  .option('-c, --chart <chartName>', 'Name of specific chart to capture')
-  .action(async (mdFile: string, options: {chart?: string}) => {
-    let response = await fetch('http://localhost:4000/graphene/view', {
-      method: 'POST',
-      headers: {'Content-Type': 'application/json'},
-      body: JSON.stringify({mdFile, chart: options.chart}),
-    })
-    if (!response.ok) throw new Error(`View request failed: ${await response.text()}`)
-    let result = await response.json()
-
-    if (result.errors && result.errors.length > 0) {
-      console.error('Errors found:')
-      result.errors.forEach(error => console.error(JSON.stringify(error)))
-    }
-
-    if (result.stillLoading) {
-      console.error('Warning: Queries were still loading when the screenshot was taken')
-    }
-
-    // Save screenshot to temp file
-    if (result.screenshot) {
-      let filename = `graphene-screenshot-${new Date().toISOString().replace(/[:.]/g, '-')}.png`
-      let screenshotPath = path.join(os.tmpdir(), filename)
-      let base64Data = result.screenshot.replace(/^data:image\/png;base64,/, '')
-      await fs.writeFile(screenshotPath, base64Data, 'base64')
-      console.log('Screenshot saved to', screenshotPath)
-    }
+program.command('login')
+  .description('Log in to Graphene Cloud')
+  .action(async () => {
+    await loginPkce()
+    console.log('Successfully logged in')
+    process.exit(0)
   })
 
 program.parse(process.argv)