@bonnard/cli 0.2.10 → 0.2.12

package/dist/bin/{cubes-9rklhdAJ.mjs → cubes-BvtwNBUG.mjs}

@@ -1,4 +1,4 @@
-import { i as getProjectPaths } from "./bon.mjs";
+import { n as getProjectPaths } from "./project-Dj085D_B.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import YAML from "yaml";

package/dist/bin/local-BkK5XL7T.mjs

@@ -0,0 +1,3 @@
+import { a as getLocalDatasource, c as resolveEnvVarsInCredentials, i as ensureBonDir, l as saveLocalDatasources, n as addLocalDatasource, o as loadLocalDatasources, r as datasourceExists, s as removeLocalDatasource, t as isDatasourcesTrackedByGit } from "./local-ByvuW3eV.mjs";
+
+export { loadLocalDatasources };

package/dist/bin/local-ByvuW3eV.mjs

@@ -0,0 +1,149 @@
+import fs from "node:fs";
+import path from "node:path";
+import YAML from "yaml";
+import { execFileSync } from "node:child_process";
+
+//#region src/lib/local/datasources.ts
+/**
+* Local datasource storage (.bon/datasources.yaml)
+*
+* Single file containing both config and credentials.
+* Credentials may contain:
+* - Plain values: "my_password"
+* - dbt env var syntax: "{{ env_var('MY_PASSWORD') }}"
+*
+* Env vars are resolved at deploy time, not import time.
+*/
+const BON_DIR$1 = ".bon";
+const DATASOURCES_FILE$1 = "datasources.yaml";
+function getBonDir(cwd = process.cwd()) {
+	return path.join(cwd, BON_DIR$1);
+}
+function getDatasourcesPath$1(cwd = process.cwd()) {
+	return path.join(getBonDir(cwd), DATASOURCES_FILE$1);
+}
+/**
+* Ensure .bon directory exists
+*/
+function ensureBonDir(cwd = process.cwd()) {
+	const bonDir = getBonDir(cwd);
+	if (!fs.existsSync(bonDir)) fs.mkdirSync(bonDir, { recursive: true });
+}
+/**
+* Load all local datasources
+*/
+function loadLocalDatasources(cwd = process.cwd()) {
+	const filePath = getDatasourcesPath$1(cwd);
+	if (!fs.existsSync(filePath)) return [];
+	try {
+		const content = fs.readFileSync(filePath, "utf-8");
+		return YAML.parse(content)?.datasources ?? [];
+	} catch {
+		return [];
+	}
+}
+/**
+* Save all local datasources (with secure permissions since it contains credentials)
+*/
+function saveLocalDatasources(datasources, cwd = process.cwd()) {
+	ensureBonDir(cwd);
+	const filePath = getDatasourcesPath$1(cwd);
+	const file = { datasources };
+	const content = `# Bonnard datasources configuration
+# This file contains credentials - add to .gitignore
+# Env vars like {{ env_var('PASSWORD') }} are resolved at deploy time
+
+` + YAML.stringify(file, { indent: 2 });
+	fs.writeFileSync(filePath, content, { mode: 384 });
+}
+/**
+* Add a single datasource (updates existing or appends new)
+*/
+function addLocalDatasource(datasource, cwd = process.cwd()) {
+	const existing = loadLocalDatasources(cwd);
+	const index = existing.findIndex((ds) => ds.name === datasource.name);
+	if (index >= 0) existing[index] = datasource;
+	else existing.push(datasource);
+	saveLocalDatasources(existing, cwd);
+}
+/**
+* Remove a datasource by name
+*/
+function removeLocalDatasource(name, cwd = process.cwd()) {
+	const existing = loadLocalDatasources(cwd);
+	const filtered = existing.filter((ds) => ds.name !== name);
+	if (filtered.length === existing.length) return false;
+	saveLocalDatasources(filtered, cwd);
+	return true;
+}
+/**
+* Get a single datasource by name
+*/
+function getLocalDatasource(name, cwd = process.cwd()) {
+	return loadLocalDatasources(cwd).find((ds) => ds.name === name) ?? null;
+}
+/**
+* Check if a datasource name already exists locally
+*/
+function datasourceExists(name, cwd = process.cwd()) {
+	return getLocalDatasource(name, cwd) !== null;
+}
+/**
+* Resolve {{ env_var('VAR_NAME') }} patterns in credentials
+* Used at deploy time to resolve env vars before uploading
+*/
+function resolveEnvVarsInCredentials(credentials) {
+	const resolved = {};
+	const missing = [];
+	const envVarPattern = /\{\{\s*env_var\(['"]([\w_]+)['"]\)\s*\}\}/;
+	for (const [key, value] of Object.entries(credentials)) {
+		const match = value.match(envVarPattern);
+		if (match) {
+			const varName = match[1];
+			const envValue = process.env[varName];
+			if (envValue !== void 0) resolved[key] = envValue;
+			else {
+				missing.push(varName);
+				resolved[key] = value;
+			}
+		} else resolved[key] = value;
+	}
+	return {
+		resolved,
+		missing
+	};
+}
+
+//#endregion
+//#region src/lib/local/credentials.ts
+/**
+* Credential utilities (git tracking check)
+*/
+const BON_DIR = ".bon";
+const DATASOURCES_FILE = "datasources.yaml";
+function getDatasourcesPath(cwd = process.cwd()) {
+	return path.join(cwd, BON_DIR, DATASOURCES_FILE);
+}
+/**
+* Check if datasources file is tracked by git (it shouldn't be - contains credentials)
+*/
+function isDatasourcesTrackedByGit(cwd = process.cwd()) {
+	const filePath = getDatasourcesPath(cwd);
+	if (!fs.existsSync(filePath)) return false;
+	try {
+		execFileSync("git", [
+			"ls-files",
+			"--error-unmatch",
+			filePath
+		], {
+			cwd,
+			stdio: "pipe"
+		});
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+//#endregion
+export { getLocalDatasource as a, resolveEnvVarsInCredentials as c, ensureBonDir as i, saveLocalDatasources as l, addLocalDatasource as n, loadLocalDatasources as o, datasourceExists as r, removeLocalDatasource as s, isDatasourcesTrackedByGit as t };

package/dist/bin/project-Dj085D_B.mjs

@@ -0,0 +1,27 @@
+import fs from "node:fs";
+import path from "node:path";
+
+//#region src/lib/project.ts
+/**
+* The subdirectory name used for Bonnard cube/view files.
+* Keeps Bonnard files namespaced to avoid conflicts with existing
+* project directories (e.g. dbt's models/).
+*/
+const BONNARD_DIR = "bonnard";
+/**
+* Resolve Bonnard project paths relative to the working directory.
+* All cube/view operations should use these paths.
+*/
+function getProjectPaths(cwd) {
+	const bonnardRoot = path.join(cwd, BONNARD_DIR);
+	return {
+		root: bonnardRoot,
+		cubes: path.join(bonnardRoot, "cubes"),
+		views: path.join(bonnardRoot, "views"),
+		config: path.join(cwd, "bon.yaml"),
+		localState: path.join(cwd, ".bon")
+	};
+}
+
+//#endregion
+export { getProjectPaths as n, BONNARD_DIR as t };

package/dist/bin/{push-Bv9AFGc2.mjs → push-BOkUmRL8.mjs}

@@ -1,4 +1,5 @@
-import { n as resolveEnvVarsInCredentials, r as post, t as getLocalDatasource } from "./bon.mjs";
+import { r as post } from "./api-DqgY-30K.mjs";
+import { a as getLocalDatasource, c as resolveEnvVarsInCredentials } from "./local-ByvuW3eV.mjs";
 import pc from "picocolors";
 import "@inquirer/prompts";
 

package/dist/bin/{validate-Bc8zGNw7.mjs → validate-C4W_Vto2.mjs}

@@ -1,4 +1,4 @@
-import { i as getProjectPaths } from "./bon.mjs";
+import { n as getProjectPaths } from "./project-Dj085D_B.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import YAML from "yaml";

package/dist/docs/topics/dashboards.examples.md

@@ -15,50 +15,45 @@ description: Monthly revenue trends and breakdowns
 # Revenue Overview
 
 ` ``query total_revenue
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 ` ``
 
 ` ``query order_count
-cube: orders
-measures: [count]
+measures: [orders.count]
 ` ``
 
 ` ``query avg_order
-cube: orders
-measures: [avg_order_value]
+measures: [orders.avg_order_value]
 ` ``
 
 <Grid cols="3">
-<BigValue data={total_revenue} value="total_revenue" title="Total Revenue" />
-<BigValue data={order_count} value="count" title="Orders" />
-<BigValue data={avg_order} value="avg_order_value" title="Avg Order" />
+<BigValue data={total_revenue} value="orders.total_revenue" title="Total Revenue" />
+<BigValue data={order_count} value="orders.count" title="Orders" />
+<BigValue data={avg_order} value="orders.avg_order_value" title="Avg Order" />
 </Grid>
 
 ## Monthly Trend
 
 ` ``query monthly_revenue
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
   dateRange: [2025-01-01, 2025-12-31]
 ` ``
 
-<LineChart data={monthly_revenue} x="created_at" y="total_revenue" title="Monthly Revenue" />
+<LineChart data={monthly_revenue} x="orders.created_at" y="orders.total_revenue" title="Monthly Revenue" />
 
 ## By Category
 
 ` ``query by_category
-cube: orders
-measures: [total_revenue, count]
-dimensions: [category]
+measures: [orders.total_revenue, orders.count]
+dimensions: [orders.category]
 orderBy:
-  total_revenue: desc
+  orders.total_revenue: desc
 ` ``
 
-<BarChart data={by_category} x="category" y="total_revenue" title="Revenue by Category" />
+<BarChart data={by_category} x="orders.category" y="orders.total_revenue" title="Revenue by Category" />
 <DataTable data={by_category} />
 ```
 
@@ -75,43 +70,40 @@ description: Order status breakdown and city analysis
 # Sales Pipeline
 
 ` ``query by_status
-cube: orders
-measures: [count]
-dimensions: [status]
+measures: [orders.count]
+dimensions: [orders.status]
 ` ``
 
-<PieChart data={by_status} name="status" value="count" title="Order Status" />
+<PieChart data={by_status} name="orders.status" value="orders.count" title="Order Status" />
 
 ## Top Cities
 
 ` ``query top_cities
-cube: orders
-measures: [total_revenue, count]
-dimensions: [city]
+measures: [orders.total_revenue, orders.count]
+dimensions: [orders.city]
 orderBy:
-  total_revenue: desc
+  orders.total_revenue: desc
 limit: 10
 ` ``
 
-<BarChart data={top_cities} x="city" y="total_revenue" horizontal />
+<BarChart data={top_cities} x="orders.city" y="orders.total_revenue" horizontal />
 <DataTable data={top_cities} />
 
 ## Completed Orders Over Time
 
 ` ``query completed_trend
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: week
   dateRange: [2025-01-01, 2025-06-30]
 filters:
-  - dimension: status
+  - dimension: orders.status
     operator: equals
     values: [completed]
 ` ``
 
-<AreaChart data={completed_trend} x="created_at" y="total_revenue" title="Completed Order Revenue" />
+<AreaChart data={completed_trend} x="orders.created_at" y="orders.total_revenue" title="Completed Order Revenue" />
 ```
 
 ## Multi-Series Dashboard
@@ -127,39 +119,37 @@ description: Multi-series charts showing revenue breakdown by sales channel
 # Revenue by Channel
 
 ` ``query revenue_by_channel
-cube: orders
-measures: [total_revenue]
-dimensions: [channel]
+measures: [orders.total_revenue]
+dimensions: [orders.channel]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
   dateRange: [2025-01-01, 2025-12-31]
 ` ``
 
 ## Stacked Bar (default)
 
-<BarChart data={revenue_by_channel} x="created_at" y="total_revenue" series="channel" title="Revenue by Channel" />
+<BarChart data={revenue_by_channel} x="orders.created_at" y="orders.total_revenue" series="orders.channel" title="Revenue by Channel" />
 
 ## Grouped Bar
 
-<BarChart data={revenue_by_channel} x="created_at" y="total_revenue" series="channel" type="grouped" title="Revenue by Channel (Grouped)" />
+<BarChart data={revenue_by_channel} x="orders.created_at" y="orders.total_revenue" series="orders.channel" type="grouped" title="Revenue by Channel (Grouped)" />
 
 ## Multi-Line
 
 ` ``query trend
-cube: orders
-measures: [total_revenue, count]
+measures: [orders.total_revenue, orders.count]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
   dateRange: [2025-01-01, 2025-12-31]
 ` ``
 
-<LineChart data={trend} x="created_at" y="total_revenue,count" title="Revenue vs Orders" />
+<LineChart data={trend} x="orders.created_at" y="orders.total_revenue,orders.count" title="Revenue vs Orders" />
 
 ## Stacked Area by Channel
 
-<AreaChart data={revenue_by_channel} x="created_at" y="total_revenue" series="channel" type="stacked" title="Revenue by Channel" />
+<AreaChart data={revenue_by_channel} x="orders.created_at" y="orders.total_revenue" series="orders.channel" type="stacked" title="Revenue by Channel" />
 ```
 
 ## Formatted Dashboard
@@ -175,40 +165,37 @@ description: Formatted revenue metrics and trends
 # Sales Performance
 
 ` ``query totals
-cube: orders
-measures: [total_revenue, count, avg_order_value]
+measures: [orders.total_revenue, orders.count, orders.avg_order_value]
 ` ``
 
 <Grid cols="3">
-<BigValue data={totals} value="total_revenue" title="Revenue" fmt="eur2" />
-<BigValue data={totals} value="count" title="Orders" fmt="num0" />
-<BigValue data={totals} value="avg_order_value" title="Avg Order" fmt="eur2" />
+<BigValue data={totals} value="orders.total_revenue" title="Revenue" fmt="eur2" />
+<BigValue data={totals} value="orders.count" title="Orders" fmt="num0" />
+<BigValue data={totals} value="orders.avg_order_value" title="Avg Order" fmt="eur2" />
 </Grid>
 
 ## Revenue Trend
 
 ` ``query monthly
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
   dateRange: [2025-01-01, 2025-12-31]
 ` ``
 
-<LineChart data={monthly} x="created_at" y="total_revenue" title="Monthly Revenue" yFmt="eur" />
+<LineChart data={monthly} x="orders.created_at" y="orders.total_revenue" title="Monthly Revenue" yFmt="eur" />
 
 ## Detail Table
 
 ` ``query details
-cube: orders
-measures: [total_revenue, count]
-dimensions: [category]
+measures: [orders.total_revenue, orders.count]
+dimensions: [orders.category]
 orderBy:
-  total_revenue: desc
+  orders.total_revenue: desc
 ` ``
 
-<DataTable data={details} fmt="total_revenue:eur2,count:num0" />
+<DataTable data={details} fmt="orders.total_revenue:eur2,orders.count:num0" />
 ```
 
 ## Interactive Dashboard
@@ -224,47 +211,43 @@ description: Sales dashboard with date and channel filters
 # Interactive Sales
 
 <DateRange name="period" default="last-6-months" label="Time Period" />
-<Dropdown name="channel" dimension="channel" data={channels} queries="trend,by_city" label="Channel" />
+<Dropdown name="channel" dimension="orders.channel" data={channels} queries="trend,by_city" label="Channel" />
 
 ` ``query channels
-cube: orders
-dimensions: [channel]
+dimensions: [orders.channel]
 ` ``
 
 ` ``query kpis
-cube: orders
-measures: [total_revenue, count]
+measures: [orders.total_revenue, orders.count]
 ` ``
 
 <Grid cols="2">
-<BigValue data={kpis} value="total_revenue" title="Revenue" fmt="eur2" />
-<BigValue data={kpis} value="count" title="Orders" fmt="num0" />
+<BigValue data={kpis} value="orders.total_revenue" title="Revenue" fmt="eur2" />
+<BigValue data={kpis} value="orders.count" title="Orders" fmt="num0" />
 </Grid>
 
 ## Revenue Trend
 
 ` ``query trend
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
 ` ``
 
-<LineChart data={trend} x="created_at" y="total_revenue" title="Monthly Revenue" yFmt="eur" />
+<LineChart data={trend} x="orders.created_at" y="orders.total_revenue" title="Monthly Revenue" yFmt="eur" />
 
 ## By City
 
 ` ``query by_city
-cube: orders
-measures: [total_revenue]
-dimensions: [city]
+measures: [orders.total_revenue]
+dimensions: [orders.city]
 orderBy:
-  total_revenue: desc
+  orders.total_revenue: desc
 limit: 10
 ` ``
 
-<BarChart data={by_city} x="city" y="total_revenue" title="Top Cities" yFmt="eur" />
+<BarChart data={by_city} x="orders.city" y="orders.total_revenue" title="Top Cities" yFmt="eur" />
 ```
 
 The `<DateRange>` automatically applies to all queries with a `timeDimension` (here: `trend`). The `<Dropdown>` filters `trend` and `by_city` by channel. The `channels` query populates the dropdown and is never filtered by it.
@@ -273,12 +256,12 @@ The `<DateRange>` automatically applies to all queries with a `timeDimension` (h
 
 - **Start with KPIs**: Use `BigValue` in a `Grid` at the top for key metrics
 - **One query per chart**: Each component gets its own query — keep them focused
-- **Use views**: Prefer view names over cube names when available for cleaner field names
+- **Use views**: Prefer view names over cube names when available
 - **Name queries descriptively**: `monthly_revenue` is better than `q1`
 - **Limit large datasets**: Add `limit` to dimension queries to avoid oversized charts
 - **Time series**: Always use `timeDimension` with `granularity` for time-based charts
-- **Multi-series**: Use `series="column"` to split data by a dimension. For bars, default is stacked; use `type="grouped"` for side-by-side
-- **Multiple y columns**: Use comma-separated values like `y="revenue,cases"` to show multiple measures on one chart
+- **Multi-series**: Use `series="cube.column"` to split data by a dimension. For bars, default is stacked; use `type="grouped"` for side-by-side
+- **Multiple y columns**: Use comma-separated values like `y="orders.revenue,orders.cases"` to show multiple measures on one chart
 
 ## See Also
 

package/dist/docs/topics/dashboards.inputs.md

@@ -54,7 +54,7 @@ Targeting lets you control which queries a filter affects — useful when some c
 Renders a dropdown selector populated from a query's dimension values. Adds a filter on the specified dimension to targeted queries.
 
 ```markdown
-<Dropdown name="channel" dimension="channel" data={channels} queries="main,trend" label="Channel" />
+<Dropdown name="channel" dimension="orders.channel" data={channels} queries="main,trend" label="Channel" />
 ```
 
 ### Props
@@ -86,14 +86,13 @@ title: Revenue Trends
 <DateRange name="period" default="last-6-months" label="Time Period" />
 
 ` ``query monthly_revenue
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
 ` ``
 
-<LineChart data={monthly_revenue} x="created_at" y="total_revenue" />
+<LineChart data={monthly_revenue} x="orders.created_at" y="orders.total_revenue" />
 ```
 
 The DateRange automatically applies to `monthly_revenue` because it has a `timeDimension`. No hardcoded `dateRange` needed in the query.
@@ -106,19 +105,17 @@ title: Sales by Channel
 ---
 
 ` ``query channels
-cube: orders
-dimensions: [channel]
+dimensions: [orders.channel]
 ` ``
 
-<Dropdown name="ch" dimension="channel" data={channels} queries="main" label="Channel" />
+<Dropdown name="ch" dimension="orders.channel" data={channels} queries="main" label="Channel" />
 
 ` ``query main
-cube: orders
-measures: [total_revenue]
-dimensions: [city]
+measures: [orders.total_revenue]
+dimensions: [orders.city]
 ` ``
 
-<BarChart data={main} x="city" y="total_revenue" />
+<BarChart data={main} x="orders.city" y="orders.total_revenue" />
 ```
 
 ### Combined inputs
@@ -129,30 +126,27 @@ title: Sales Dashboard
 ---
 
 <DateRange name="period" default="last-6-months" label="Time Period" />
-<Dropdown name="channel" dimension="channel" data={channels} queries="trend,by_city" label="Channel" />
+<Dropdown name="channel" dimension="orders.channel" data={channels} queries="trend,by_city" label="Channel" />
 
 ` ``query channels
-cube: orders
-dimensions: [channel]
+dimensions: [orders.channel]
 ` ``
 
 ` ``query trend
-cube: orders
-measures: [total_revenue]
+measures: [orders.total_revenue]
 timeDimension:
-  dimension: created_at
+  dimension: orders.created_at
   granularity: month
 ` ``
 
-<LineChart data={trend} x="created_at" y="total_revenue" />
+<LineChart data={trend} x="orders.created_at" y="orders.total_revenue" />
 
 ` ``query by_city
-cube: orders
-measures: [total_revenue]
-dimensions: [city]
+measures: [orders.total_revenue]
+dimensions: [orders.city]
 ` ``
 
-<BarChart data={by_city} x="city" y="total_revenue" />
+<BarChart data={by_city} x="orders.city" y="orders.total_revenue" />
 ```
 
 Both inputs work together: the DateRange scopes the time window on `trend` (which has a timeDimension), and the Dropdown filters both `trend` and `by_city` by channel.

package/dist/docs/topics/dashboards.md

@@ -27,19 +27,17 @@ description: Key metrics for the orders pipeline
 # Order Summary
 
 ` ``query order_count
-cube: orders
-measures: [count]
+measures: [orders.count]
 ` ``
 
-<BigValue data={order_count} value="count" title="Total Orders" />
+<BigValue data={order_count} value="orders.count" title="Total Orders" />
 
 ` ``query by_status
-cube: orders
-measures: [count]
-dimensions: [status]
+measures: [orders.count]
+dimensions: [orders.status]
 ` ``
 
-<BarChart data={by_status} x="status" y="count" />
+<BarChart data={by_status} x="orders.status" y="orders.count" />
 ```
 
 ## Frontmatter