@graphenedata/cli 0.0.5 → 0.0.6

package/cli.ts

@@ -7,8 +7,9 @@ import fs from 'fs-extra'
 import path from 'path'
 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,31 +47,28 @@ 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')
@@ -82,6 +80,14 @@ program
     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('login')
+  .description('Log in to Graphene Cloud')
+  .action(async () => {
+    await loginPkce()
+    console.log('Successfully logged in')
+    process.exit(0)
+  })
+
 program.parse(process.argv)
 
 async function readInput (arg): Promise<string> {