@gscdump/engine-duckdb-wasm 0.25.6 → 0.25.8

package/dist/index.mjs

@@ -77,6 +77,37 @@ function rangePredicate(q) {
 		]
 	};
 }
+function facetPredicate(query) {
+	const facets = query.facets;
+	if (!facets?.length) return {
+		sql: "",
+		params: []
+	};
+	const parts = [];
+	const params = [];
+	for (const f of facets) {
+		const col = DIM_COLUMN[f.column] ?? f.column;
+		switch (f.op) {
+			case "eq":
+				parts.push(`${col} = ?`);
+				params.push(f.value);
+				break;
+			case "regex":
+				parts.push(`regexp_matches(LOWER(${col}), ?)`);
+				params.push(f.value);
+				break;
+			case "notRegex":
+				parts.push(`NOT regexp_matches(LOWER(${col}), ?)`);
+				params.push(f.value);
+				break;
+			default: throw new Error(`[archetype-sql] unknown facet op: ${f.op}`);
+		}
+	}
+	return {
+		sql: parts.length ? ` AND ${parts.join(" AND ")}` : "",
+		params
+	};
+}
 function compileArchetypeSql(query) {
 	switch (query.archetype) {
 		case "site-daily-timeseries": {
@@ -134,8 +165,13 @@ function compileArchetypeSql(query) {
 				};
 			}
 			const col = DIM_COLUMN[query.dimension];
-			let sql = `SELECT ${col} AS ${query.dimension}, ${metricSelectList(query.metrics)} FROM ${table} WHERE ${where.sql} GROUP BY ${col} ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
-			const params = [...where.params, query.limit];
+			const facet = facetPredicate(query);
+			let sql = `SELECT ${col} AS ${query.dimension}, ${metricSelectList(query.metrics)} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col} ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
+			const params = [
+				...where.params,
+				...facet.params,
+				query.limit
+			];
 			if (query.offset && query.offset > 0) {
 				sql += " OFFSET ?";
 				params.push(query.offset);
@@ -183,29 +219,10 @@ function compileArchetypeSql(query) {
 				params: where.params
 			};
 		}
-		case "preset-analyzer": {
-			const table = "queries";
-			const where = rangePredicate(query);
-			const params = query.params ?? {};
-			const minPos = Number(params.minPosition ?? 4);
-			const maxPos = Number(params.maxPosition ?? 20);
-			const minImpr = Number(params.minImpressions ?? 10);
-			const limit = Number(params.limit ?? 1e3);
-			return {
-				table,
-				sql: `SELECT query, ${metricExpr("clicks")} AS clicks, ${metricExpr("impressions")} AS impressions, ${metricExpr("position")} AS position FROM ${table} WHERE ${where.sql} GROUP BY query HAVING position BETWEEN ? AND ? AND impressions > ? ORDER BY impressions DESC LIMIT ?`,
-				params: [
-					...where.params,
-					minPos,
-					maxPos,
-					minImpr,
-					limit
-				]
-			};
-		}
 		case "two-dimension-detail": {
 			const table = "page_queries";
 			const where = rangePredicate(query);
+			const facet = facetPredicate(query);
 			const filterParts = [];
 			const filterParams = [];
 			if (query.filter?.page) {
@@ -217,8 +234,12 @@ function compileArchetypeSql(query) {
 				filterParams.push(query.filter.query);
 			}
 			const filterSql = filterParts.length ? ` AND ${filterParts.join(" AND ")}` : "";
-			let sql = `SELECT url AS page, query, ${metricSelectList(query.metrics)} FROM ${table} WHERE ${where.sql}${filterSql} GROUP BY url, query`;
-			const params = [...where.params, ...filterParams];
+			let sql = `SELECT url AS page, query, ${metricSelectList(query.metrics)} FROM ${table} WHERE ${where.sql}${filterSql}${facet.sql} GROUP BY url, query`;
+			const params = [
+				...where.params,
+				...filterParams,
+				...facet.params
+			];
 			if (query.orderBy) {
 				const dir = query.orderBy.dir === "asc" ? "ASC" : "DESC";
 				sql += ` ORDER BY ${query.orderBy.metric} ${dir}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "0.25.6",
+  "version": "0.25.8",
   "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.25.6",
-    "@gscdump/sdk": "0.25.6",
-    "gscdump": "0.25.6"
+    "@gscdump/engine": "0.25.8",
+    "gscdump": "0.25.8",
+    "@gscdump/sdk": "0.25.8"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",