@graphenedata/cli 0.0.5 → 0.0.7

package/cli.ts

@@ -5,17 +5,17 @@ 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 {loadConfig} from '../lang/config.ts'
+import dotenv from 'dotenv'
+import {config, loadConfig} from '../lang/config.ts'
 import {runServeInBackground, stopGrapheneIfRunning} from './background.ts'
-import {getConnection} from './connections/index.ts'
 import {check} from './check.ts'
+import {getConnection, runQuery} from './connections/index.ts'
+import {loginPkce} from './auth.ts'
 
+dotenv.config({quiet: true})
 const program = new Command()
 
-program
-  .name('graphene')
-  .description('Graphene CLI')
-  .version('1.0.0')
+program.name('graphene').description('Graphene CLI').version('1.0.0')
 
 program.hook('preAction', async () => {
   if (process.env.CLI_DELAY) { // useful if you want to attach a debugger
@@ -46,31 +46,60 @@ 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('schema')
+  .description('Inspect database tables or describe a table')
+  .argument('[schema | table]', 'Optional schema or table name to describe')
+  .action(async (tableArg: string) => {
+    let connection = await getConnection()
+    let datasets = await connection.listDatasets()
+
+    // if there's no arg and more than one dataset, just list the datasets
+    if (!tableArg && datasets.length > 1) {
+      return console.log(`Datasets available:\n${datasets.join('\n')}`)
+    }
+
+    // figure out if you're wanting to list tables in a schema/dataset
+    let dsToList: string | null = null
+    if (datasets.includes(tableArg)) dsToList = tableArg // you gave the name of a dataset
+    else if (!tableArg && datasets.length == 1) dsToList = datasets[0] // only one dataset, and no args
+    else if (!tableArg && config.namespace) dsToList = config.namespace // default namespace configured
+    else if (!tableArg && config.dialect == 'duckdb') dsToList = '<default>'
+
+    if (dsToList) {
+      let tables = await connection.listTables(dsToList)
+      return console.log(`Tables${dsToList ? ` in ${dsToList}` : ''}:\n${tables.join('\n')}`)
+    }
+
+    // otherwise, assume you're wanting to see tables
+    let cols = await connection.describeTable(tableArg)
+    if (!cols.length) return console.log(`Table ${tableArg} not found`)
+    console.log(`table ${tableArg} (`)
+    cols.forEach(col => console.log(`  ${col.name} ${col.dataType}`))
+    console.log(')')
+  })
+
 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 +111,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> {