@gscdump/engine-duckdb-wasm 0.32.12 → 0.33.0

package/dist/index.mjs

@@ -20,11 +20,16 @@ const METRIC_SQL = {
 const DIM_COLUMN = {
 	page: "url",
 	query: "query",
-	queryCanonical: "query_canonical",
 	country: "country",
 	date: "date",
 	searchAppearance: "search_appearance"
 };
+function queryCanonicalExpr(queryRef = "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 tableForDimensions(dims) {
 	const set = new Set(dims.filter((d) => d !== "date"));
 	if (set.has("page") && (set.has("query") || set.has("queryCanonical"))) return "page_queries";
@@ -128,7 +133,7 @@ function facetPredicate(query) {
 	const parts = [];
 	const params = [];
 	for (const f of facets) {
-		const col = DIM_COLUMN[f.column] ?? f.column;
+		const col = dimExpr(f.column);
 		switch (f.op) {
 			case "eq":
 				parts.push(`${col} = ?`);
@@ -163,7 +168,7 @@ function compileArchetypeSql(query) {
 		}
 		case "entity-daily-timeseries": {
 			const table = tableForDimensions([query.entity.dimension]);
-			const col = DIM_COLUMN[query.entity.dimension];
+			const col = dimExpr(query.entity.dimension);
 			const where = rangePredicate(query);
 			return {
 				table,
@@ -173,7 +178,7 @@ function compileArchetypeSql(query) {
 		}
 		case "entity-daily-sparkline": {
 			const table = tableForDimensions([query.dimension]);
-			const col = DIM_COLUMN[query.dimension];
+			const col = dimExpr(query.dimension);
 			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(", ");
@@ -231,7 +236,7 @@ function compileArchetypeSql(query) {
 					params
 				};
 			}
-			const col = DIM_COLUMN[query.dimension];
+			const col = dimExpr(query.dimension);
 			const facet = facetPredicate(query);
 			const totalCol = query.includeTotal ? ", COUNT(*) OVER() AS __total" : "";
 			if (cmp) {
@@ -281,7 +286,7 @@ function compileArchetypeSql(query) {
 			const matchParts = [];
 			const matchParams = [];
 			for (const [dim, value] of Object.entries(query.match)) {
-				const col = DIM_COLUMN[dim];
+				const col = dimExpr(dim);
 				if (!col) throw new Error(`[archetype-sql] single-row-lookup: unknown dimension ${dim}`);
 				matchParts.push(`${col} = ?`);
 				matchParams.push(value);
@@ -305,7 +310,7 @@ function compileArchetypeSql(query) {
 					...where.params
 				]
 			};
-			const col = DIM_COLUMN[query.seriesDimension];
+			const col = dimExpr(query.seriesDimension);
 			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}`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "0.32.12",
+  "version": "0.33.0",
   "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/engine": "0.32.12",
-    "@gscdump/contracts": "0.32.12",
-    "gscdump": "0.32.12"
+    "gscdump": "0.33.0",
+    "@gscdump/engine": "0.33.0",
+    "@gscdump/contracts": "0.33.0"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",