@gscdump/engine-duckdb-wasm 0.36.1 → 0.36.3

package/dist/index.mjs

@@ -24,11 +24,18 @@ const DIM_COLUMN = {
 	date: "date",
 	searchAppearance: "search_appearance"
 };
-function queryCanonicalExpr(queryRef = "query") {
+function quoteIdent(value) {
+	return `"${value.replace(/"/g, "\"\"")}"`;
+}
+function qualifiedColumn(table, column) {
+	return `${quoteIdent(table)}.${quoteIdent(column)}`;
+}
+function queryCanonicalExpr(table) {
+	const queryRef = qualifiedColumn(table, "query");
 	return `COALESCE((SELECT qd.query_canonical FROM query_dim qd WHERE qd.query = ${queryRef} LIMIT 1), ${queryRef})`;
 }
-function dimExpr(dim) {
-	return dim === "queryCanonical" ? queryCanonicalExpr() : DIM_COLUMN[dim] ?? dim;
+function dimExpr(dim, table) {
+	return dim === "queryCanonical" ? queryCanonicalExpr(table) : DIM_COLUMN[dim] ?? dim;
 }
 function tableForDimensions(dims) {
 	const set = new Set(dims.filter((d) => d !== "date"));
@@ -38,6 +45,15 @@ function tableForDimensions(dims) {
 	if (set.has("device")) return "dates";
 	return "pages";
 }
+function tableForTopNBreakdown(query) {
+	const dims = [query.dimension];
+	for (const facet of query.facets ?? []) {
+		const hasPage = query.dimension === "page" || facet.column === "page";
+		const hasQuery = query.dimension === "query" || query.dimension === "queryCanonical" || facet.column === "query" || facet.column === "queryCanonical";
+		if (hasPage && hasQuery) dims.push(facet.column);
+	}
+	return tableForDimensions(dims);
+}
 function metricExpr(metric) {
 	const expr = METRIC_SQL[metric];
 	if (!expr) throw new Error(`[archetype-sql] unknown metric: ${metric}`);
@@ -124,7 +140,7 @@ function moverClause(movers) {
 		default: throw new Error(`[archetype-sql] unknown movers mode: ${movers}`);
 	}
 }
-function facetPredicate(query) {
+function facetPredicate(query, table) {
 	const facets = query.facets;
 	if (!facets?.length) return {
 		sql: "",
@@ -133,7 +149,7 @@ function facetPredicate(query) {
 	const parts = [];
 	const params = [];
 	for (const f of facets) {
-		const col = dimExpr(f.column);
+		const col = dimExpr(f.column, table);
 		switch (f.op) {
 			case "eq":
 				parts.push(`${col} = ?`);
@@ -168,7 +184,7 @@ function compileArchetypeSql(query) {
 		}
 		case "entity-daily-timeseries": {
 			const table = tableForDimensions([query.entity.dimension]);
-			const col = dimExpr(query.entity.dimension);
+			const col = dimExpr(query.entity.dimension, table);
 			const where = rangePredicate(query);
 			return {
 				table,
@@ -178,7 +194,7 @@ function compileArchetypeSql(query) {
 		}
 		case "entity-daily-sparkline": {
 			const table = tableForDimensions([query.dimension]);
-			const col = dimExpr(query.dimension);
+			const col = dimExpr(query.dimension, table);
 			const where = rangePredicate(query);
 			if (query.entities.length === 0) throw new Error("[archetype-sql] entity-daily-sparkline requires resolved entities");
 			const placeholders = query.entities.map(() => "?").join(", ");
@@ -189,7 +205,7 @@ function compileArchetypeSql(query) {
 			};
 		}
 		case "top-n-breakdown": {
-			const table = tableForDimensions([query.dimension]);
+			const table = tableForTopNBreakdown(query);
 			const where = rangePredicate(query);
 			const cmp = compareRangePredicate(query);
 			const dir = query.orderBy.dir === "asc" ? "ASC" : "DESC";
@@ -237,8 +253,8 @@ function compileArchetypeSql(query) {
 					params
 				};
 			}
-			const col = dimExpr(query.dimension);
-			const facet = facetPredicate(query);
+			const col = dimExpr(query.dimension, table);
+			const facet = facetPredicate(query, table);
 			const totalCol = query.includeTotal ? ", COUNT(*) OVER() AS __total" : "";
 			if (cmp) {
 				const curCols = metricList.map((m) => coalesceMetric(m, "c", m)).join(", ");
@@ -287,7 +303,7 @@ function compileArchetypeSql(query) {
 			const matchParts = [];
 			const matchParams = [];
 			for (const [dim, value] of Object.entries(query.match)) {
-				const col = dimExpr(dim);
+				const col = dimExpr(dim, table);
 				if (!col) throw new Error(`[archetype-sql] single-row-lookup: unknown dimension ${dim}`);
 				matchParts.push(`${col} = ?`);
 				matchParams.push(value);
@@ -311,7 +327,7 @@ function compileArchetypeSql(query) {
 					...where.params
 				]
 			};
-			const col = dimExpr(query.seriesDimension);
+			const col = dimExpr(query.seriesDimension, table);
 			return {
 				table,
 				sql: `SELECT date, ${col} AS ${query.seriesDimension}, ${metricExpr(query.metric)} AS ${query.metric} FROM ${table} WHERE ${where.sql} GROUP BY date, ${col} ORDER BY date, ${col}`,
@@ -321,7 +337,7 @@ function compileArchetypeSql(query) {
 		case "two-dimension-detail": {
 			const table = "page_queries";
 			const where = rangePredicate(query);
-			const facet = facetPredicate(query);
+			const facet = facetPredicate(query, table);
 			const filterParts = [];
 			const filterParams = [];
 			if (query.filter?.page) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "0.36.1",
+  "version": "0.36.3",
   "description": "DuckDB-WASM engine adapter for @gscdump/analysis — typed browser analytics against parquet via R2.",
   "author": {
     "name": "Harlan Wilton",
@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "drizzle-orm": "1.0.0-rc.3",
-    "@gscdump/contracts": "0.36.1",
-    "@gscdump/engine": "0.36.1",
-    "gscdump": "0.36.1"
+    "@gscdump/contracts": "0.36.3",
+    "@gscdump/engine": "0.36.3",
+    "gscdump": "0.36.3"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",