@graphenedata/cli 0.0.16 → 0.0.17

package/dist/ui/internal/queryEngine.ts

@@ -15,7 +15,7 @@ interface QueryNode {
   contents: string
   callback?: ResultHandler
   loading: boolean
-  fields: Map<string, string | string[]>
+  fields: string[]
   componentId?: string
   error?: GrapheneError
 }
@@ -39,24 +39,22 @@ export const setQueryFetcher = f => (queryFetcher = f)
 // Called by GrapheneQuery tags to register a named query on the page
 function registerQuery(name: string, contents: string) {
   queries = queries.filter(q => q.name !== name)
-  queries.push({name, contents, loading: false, fields: new Map()})
+  queries.push({name, contents, loading: false, fields: []})
 }
 
 // Called by viz components to request a particular query of data
 function query(source: string, fields: Record<string, string | string[]>, callback: ResultHandler, componentId?: string) {
-  // using Map here because it preserves the order in which we add fields to the select, which we use when we get the result.
-  let map = new Map(Object.entries(fields))
-  let exprs: string[] = []
-  if (map.size > 0) {
-    map.forEach(value => {
-      if (Array.isArray(value)) exprs.push(...value)
-      else exprs.push(value)
+  // Preserve field order because translateData maps result fields back to requested expressions by index.
+  let seen = new Set<string>()
+  let exprs = Object.values(fields)
+    .flatMap(value => (Array.isArray(value) ? value : [value]))
+    .filter(field => {
+      if (seen.has(field)) return false
+      seen.add(field)
+      return true
     })
-  } else {
-    exprs = ['*']
-  }
-  let contents = `from ${source} select ${exprs.join(', ')}`
-  queries.push({contents, callback, loading: false, fields: map, source, componentId})
+  let contents = `from ${source} select ${(exprs.length ? exprs : ['*']).join(', ')}`
+  queries.push({contents, callback, loading: false, fields: exprs, source, componentId})
   runAll()
   return componentId
 }
@@ -147,7 +145,7 @@ export function translateData(data: any, node: QueryNode): QueryResult {
   let rows = data.rows || []
   let fields: Field[] = []
 
-  let requestFields = Array.from(node.fields.values()).flatMap(f => f)
+  let requestFields = node.fields
 
   data.fields.forEach((field, index) => {
     let requested = requestFields[index]

package/dist/ui/internal/runSocket.ts

@@ -42,17 +42,14 @@ function connect() {
   socket.onopen = () => socket!.send(JSON.stringify({type: 'register', url: window.location.href}))
 
   socket.onmessage = async event => {
-    let {type, requestId, action, chart} = JSON.parse(event.data)
-    if (type !== 'check') return
+    let {requestId, action, chart} = JSON.parse(event.data)
+    let finished = await window.$GRAPHENE.waitForLoad(20_000)
 
     if (action === 'list') {
-      await window.$GRAPHENE.pageReady
-      await new Promise(resolve => requestAnimationFrame(resolve))
       socket!.send(JSON.stringify({type: 'checkResponse', requestId, componentIds: listComponentIds()}))
       return
     }
 
-    let finished = await window.$GRAPHENE.waitForLoad(20_000)
     let screenshot = chart ? await captureChart(chart) : await takeScreenshot()
     socket!.send(JSON.stringify({type: 'checkResponse', requestId, errors: getErrors(), stillLoading: !finished, screenshot}))
   }

package/dist/ui/web.js

@@ -41,6 +41,7 @@ import LocalApp from './internal/LocalApp.svelte'
 // code only has to load once.
 // In theory we could do this with Vite splitting, but then we have a hard dependency on the exact format vite uses. Plus I find the easier to understand.
 window.$GRAPHENE = window.$GRAPHENE || {}
+window.$GRAPHENE.appLoading = false
 
 let nextRenderId = 0
 let pendingRenders = new Set()
@@ -64,11 +65,11 @@ window.$GRAPHENE.waitForLoad = async (timeout = 20_000) => {
   let g = window.$GRAPHENE
   let end = Date.now() + timeout
   while (Date.now() < end) {
-    if (!g.isQueryLoading() && pendingRenders.size == 0) {
+    if (!g.appLoading && !g.isQueryLoading() && pendingRenders.size == 0) {
       if (document.fonts?.ready) await document.fonts.ready
       await new Promise(resolve => setTimeout(resolve, 300))
       await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))
-      if (!g.isQueryLoading() && pendingRenders.size == 0) return true
+      if (!g.appLoading && !g.isQueryLoading() && pendingRenders.size == 0) return true
     }
     await new Promise(resolve => setTimeout(resolve, 100))
   }
@@ -109,5 +110,6 @@ window.$GRAPHENE.components = {
 window.$GRAPHENE.svelte = {mount, unmount}
 
 if (window.location.pathname.replace(/\/+$/, '') !== '/__ct') {
+  window.$GRAPHENE.appLoading = true
   mount(LocalApp, {target: document.body})
 }

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@graphenedata/cli",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "license": "Elastic-2.0",
   "author": "Graphene Systems Inc",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/graphene-data/graphene.git"
+  },
   "type": "module",
   "bin": {
     "graphene": "./bin.js"

package/dist/cli/chunk-QAXEOZ43.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../lang/config.ts"],
-  "sourcesContent": ["import {existsSync} from 'node:fs'\nimport {readFile} from 'node:fs/promises'\nimport path from 'path'\n\nexport interface Config {\n  root: string\n  dialect: string\n  defaultNamespace?: string\n  ignoredFiles: string[]\n  telemetry?: boolean\n  port?: number\n  host?: string\n  envFile: string[] // array of paths where we can look for the env file\n\n  bigquery?: {\n    projectId?: string\n    keyPath?: string\n  }\n\n  snowflake?: {\n    account: string\n    username: string\n    privateKeyPath: string\n    schema?: string\n    database?: string\n  }\n\n  clickhouse?: {\n    url?: string\n    username?: string\n    database?: string\n  }\n\n  duckdb?: {\n    path?: string\n  }\n}\n\nexport type ConfigInput = Omit<Config, 'root' | 'dialect' | 'ignoredFiles' | 'envFile'> & {\n  root?: string\n  dialect?: Config['dialect']\n  ignoredFiles?: Config['ignoredFiles']\n  envFile?: string | string[]\n  namespace?: string\n}\n\nexport let config: Config = {dialect: 'duckdb', root: ''} as Config\n\nexport function setGlobalConfig(cfg: ConfigInput) {\n  Object.keys(config).forEach(key => delete config[key])\n  Object.assign(config, normalizeConfig(cfg))\n}\n\nexport function normalizeConfig(input: ConfigInput, defaultRoot = process.cwd()): Config {\n  let cfg = {...input}\n  if (cfg.namespace && !cfg.defaultNamespace) cfg.defaultNamespace = cfg.namespace\n\n  let dialect = cfg.dialect || 'duckdb'\n  if (cfg.bigquery) dialect = 'bigquery'\n  else if (cfg.snowflake) dialect = 'snowflake'\n  else if (cfg.clickhouse) dialect = 'clickhouse'\n  else if (cfg.duckdb) dialect = 'duckdb'\n  let envFile = ['.env']\n  if (Array.isArray(cfg.envFile)) envFile = cfg.envFile\n  else if (cfg.envFile) envFile = [cfg.envFile]\n\n  return {\n    ...cfg,\n    dialect,\n    root: path.resolve(cfg.root || defaultRoot),\n    port: cfg.port || Number(process.env.GRAPHENE_PORT) || 4000,\n    ignoredFiles: cfg.ignoredFiles || ['**/agents.md', '**/claude.md'],\n    envFile,\n  } as Config\n}\n\n// Read graphene config from the nearest parent package.json.\nexport async function loadConfig(dir: string, envLoader: (envFiles: string[]) => void): Promise<Config> {\n  // seek upwards from dir looking for package.json\n  let configDir = path.resolve(dir)\n  while (!existsSync(path.join(configDir, 'package.json'))) {\n    let parent = path.dirname(configDir)\n    if (parent == configDir) throw new Error(`No package.json found in ${path.resolve(dir)} or its parents`)\n    configDir = parent\n  }\n\n  let txt = await readFile(path.join(configDir, 'package.json'), 'utf8')\n  let graphene = JSON.parse(txt).graphene\n  if (!graphene || typeof graphene != 'object' || Array.isArray(graphene)) {\n    throw new Error(`No graphene config found in ${path.join(configDir, 'package.json')}`)\n  }\n\n  // config can provide 1 or more env files that Graphene should load. Default to just `.env`\n  let envFiles = Array.isArray(graphene.envFile) ? graphene.envFile : [graphene.envFile || '.env']\n  envLoader(envFiles.map(file => path.resolve(configDir, file)))\n\n  let cfg = normalizeConfig({...graphene, root: configDir}, configDir)\n  return cfg\n}\n"],
-  "mappings": ";AAAA,SAAQ,kBAAiB;AACzB,SAAQ,gBAAe;AACvB,OAAO,UAAU;AA4CV,IAAI,SAAiB,EAAC,SAAS,UAAU,MAAM,GAAE;AAEjD,SAAS,gBAAgB,KAAkB;AAChD,SAAO,KAAK,MAAM,EAAE,QAAQ,SAAO,OAAO,OAAO,GAAG,CAAC;AACrD,SAAO,OAAO,QAAQ,gBAAgB,GAAG,CAAC;AAC5C;AAEO,SAAS,gBAAgB,OAAoB,cAAc,QAAQ,IAAI,GAAW;AACvF,MAAI,MAAM,EAAC,GAAG,MAAK;AACnB,MAAI,IAAI,aAAa,CAAC,IAAI,iBAAkB,KAAI,mBAAmB,IAAI;AAEvE,MAAI,UAAU,IAAI,WAAW;AAC7B,MAAI,IAAI,SAAU,WAAU;AAAA,WACnB,IAAI,UAAW,WAAU;AAAA,WACzB,IAAI,WAAY,WAAU;AAAA,WAC1B,IAAI,OAAQ,WAAU;AAC/B,MAAI,UAAU,CAAC,MAAM;AACrB,MAAI,MAAM,QAAQ,IAAI,OAAO,EAAG,WAAU,IAAI;AAAA,WACrC,IAAI,QAAS,WAAU,CAAC,IAAI,OAAO;AAE5C,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA,MAAM,KAAK,QAAQ,IAAI,QAAQ,WAAW;AAAA,IAC1C,MAAM,IAAI,QAAQ,OAAO,QAAQ,IAAI,aAAa,KAAK;AAAA,IACvD,cAAc,IAAI,gBAAgB,CAAC,gBAAgB,cAAc;AAAA,IACjE;AAAA,EACF;AACF;AAGA,eAAsB,WAAW,KAAa,WAA0D;AAEtG,MAAI,YAAY,KAAK,QAAQ,GAAG;AAChC,SAAO,CAAC,WAAW,KAAK,KAAK,WAAW,cAAc,CAAC,GAAG;AACxD,QAAI,SAAS,KAAK,QAAQ,SAAS;AACnC,QAAI,UAAU,UAAW,OAAM,IAAI,MAAM,4BAA4B,KAAK,QAAQ,GAAG,CAAC,iBAAiB;AACvG,gBAAY;AAAA,EACd;AAEA,MAAI,MAAM,MAAM,SAAS,KAAK,KAAK,WAAW,cAAc,GAAG,MAAM;AACrE,MAAI,WAAW,KAAK,MAAM,GAAG,EAAE;AAC/B,MAAI,CAAC,YAAY,OAAO,YAAY,YAAY,MAAM,QAAQ,QAAQ,GAAG;AACvE,UAAM,IAAI,MAAM,+BAA+B,KAAK,KAAK,WAAW,cAAc,CAAC,EAAE;AAAA,EACvF;AAGA,MAAI,WAAW,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,WAAW,MAAM;AAC/F,YAAU,SAAS,IAAI,UAAQ,KAAK,QAAQ,WAAW,IAAI,CAAC,CAAC;AAE7D,MAAI,MAAM,gBAAgB,EAAC,GAAG,UAAU,MAAM,UAAS,GAAG,SAAS;AACnE,SAAO;AACT;",
-  "names": []
-}

package/dist/cli/clickhouse-ZN5AN2UL.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../connections/clickhouse.ts"],
-  "sourcesContent": ["import {createClient, type ClickHouseClient} from '@clickhouse/client'\n\nimport {type QueryConnection, type QueryResult, type QueryParams, type SchemaColumn} from './types.ts'\n\nexport interface ClickHouseOptions {\n  url: string\n  username: string\n  password: string\n  database?: string\n}\n\nexport class ClickHouseConnection implements QueryConnection {\n  private client: ClickHouseClient\n  private defaultDatabase: string\n\n  constructor(options: ClickHouseOptions) {\n    this.defaultDatabase = options.database || 'default'\n    this.client = createClient({\n      url: options.url,\n      username: options.username,\n      password: options.password,\n      database: this.defaultDatabase,\n      application: 'Graphene',\n    })\n  }\n\n  async runQuery(sql: string, _params?: QueryParams): Promise<QueryResult> {\n    let result = await this.client.query({query: sql, format: 'JSONEachRow'})\n    let rows = (await result.json()) as Array<Record<string, unknown>>\n    return {rows, totalRows: rows.length}\n  }\n\n  async listDatasets(): Promise<string[]> {\n    let res = await this.runQuery(`\n      select name\n      from system.databases\n      where lower(name) not in ('system', 'information_schema')\n      order by name\n    `)\n    return res.rows.map(row => String(row['name']).toLowerCase())\n  }\n\n  async listTables(database = this.defaultDatabase): Promise<string[]> {\n    let sql = `\n      select database, name\n      from system.tables\n      where lower(database) = lower('${escapeClickHouseString(database)}')\n      order by name\n    `.trim()\n    let res = await this.runQuery(sql)\n    return res.rows.map(row => `${String(row['database']).toLowerCase()}.${String(row['name']).toLowerCase()}`)\n  }\n\n  async describeTable(target: string): Promise<SchemaColumn[]> {\n    let parts = target.split('.').filter(Boolean)\n    let table = parts.pop() || ''\n    let database = parts.join('.') || this.defaultDatabase\n    let sql = `\n      select name, type, position\n      from system.columns\n      where lower(database) = lower('${escapeClickHouseString(database)}')\n        and lower(table) = lower('${escapeClickHouseString(table)}')\n      order by position\n    `.trim()\n    let res = await this.runQuery(sql)\n    return res.rows.map(row => ({name: String(row['name']).toLowerCase(), dataType: String(row['type'])}))\n  }\n\n  async close(): Promise<void> {\n    await this.client.close()\n  }\n}\n\nfunction escapeClickHouseString(value: string) {\n  return value.replace(/\\\\/g, '\\\\\\\\').replace(/'/g, \"\\\\'\")\n}\n"],
-  "mappings": ";AAAA,SAAQ,oBAA0C;AAW3C,IAAM,uBAAN,MAAsD;AAAA,EACnD;AAAA,EACA;AAAA,EAER,YAAY,SAA4B;AACtC,SAAK,kBAAkB,QAAQ,YAAY;AAC3C,SAAK,SAAS,aAAa;AAAA,MACzB,KAAK,QAAQ;AAAA,MACb,UAAU,QAAQ;AAAA,MAClB,UAAU,QAAQ;AAAA,MAClB,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,IACf,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,SAAS,KAAa,SAA6C;AACvE,QAAI,SAAS,MAAM,KAAK,OAAO,MAAM,EAAC,OAAO,KAAK,QAAQ,cAAa,CAAC;AACxE,QAAI,OAAQ,MAAM,OAAO,KAAK;AAC9B,WAAO,EAAC,MAAM,WAAW,KAAK,OAAM;AAAA,EACtC;AAAA,EAEA,MAAM,eAAkC;AACtC,QAAI,MAAM,MAAM,KAAK,SAAS;AAAA;AAAA;AAAA;AAAA;AAAA,KAK7B;AACD,WAAO,IAAI,KAAK,IAAI,SAAO,OAAO,IAAI,MAAM,CAAC,EAAE,YAAY,CAAC;AAAA,EAC9D;AAAA,EAEA,MAAM,WAAW,WAAW,KAAK,iBAAoC;AACnE,QAAI,MAAM;AAAA;AAAA;AAAA,uCAGyB,uBAAuB,QAAQ,CAAC;AAAA;AAAA,MAEjE,KAAK;AACP,QAAI,MAAM,MAAM,KAAK,SAAS,GAAG;AACjC,WAAO,IAAI,KAAK,IAAI,SAAO,GAAG,OAAO,IAAI,UAAU,CAAC,EAAE,YAAY,CAAC,IAAI,OAAO,IAAI,MAAM,CAAC,EAAE,YAAY,CAAC,EAAE;AAAA,EAC5G;AAAA,EAEA,MAAM,cAAc,QAAyC;AAC3D,QAAI,QAAQ,OAAO,MAAM,GAAG,EAAE,OAAO,OAAO;AAC5C,QAAI,QAAQ,MAAM,IAAI,KAAK;AAC3B,QAAI,WAAW,MAAM,KAAK,GAAG,KAAK,KAAK;AACvC,QAAI,MAAM;AAAA;AAAA;AAAA,uCAGyB,uBAAuB,QAAQ,CAAC;AAAA,oCACnC,uBAAuB,KAAK,CAAC;AAAA;AAAA,MAE3D,KAAK;AACP,QAAI,MAAM,MAAM,KAAK,SAAS,GAAG;AACjC,WAAO,IAAI,KAAK,IAAI,UAAQ,EAAC,MAAM,OAAO,IAAI,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,OAAO,IAAI,MAAM,CAAC,EAAC,EAAE;AAAA,EACvG;AAAA,EAEA,MAAM,QAAuB;AAC3B,UAAM,KAAK,OAAO,MAAM;AAAA,EAC1B;AACF;AAEA,SAAS,uBAAuB,OAAe;AAC7C,SAAO,MAAM,QAAQ,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAK;AACzD;",
-  "names": []
-}