@gscdump/cloudflare 0.25.8 → 0.25.10

package/dist/server-tail/index.mjs

@@ -56,6 +56,37 @@ function partitionWhere(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 = dimColumn(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 buildSiteDailyTimeseries(q) {
 	const w = partitionWhere(q);
 	const metrics = q.metrics.map(metricExpr).join(", ");
@@ -109,11 +140,12 @@ function buildTopNBreakdown(q) {
 	const col = dimColumn(q.dimension);
 	const metrics = q.metrics.map(metricExpr).join(", ");
 	const order = `${orderMetricExpr(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
-	let sql = `SELECT ${col}, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause} GROUP BY ${col} ORDER BY ${order} LIMIT ${Math.max(0, Math.floor(q.limit))}`;
+	const facet = facetPredicate(q);
+	let sql = `SELECT ${col}, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}${facet.sql} GROUP BY ${col} ORDER BY ${order} LIMIT ${Math.max(0, Math.floor(q.limit))}`;
 	if (q.offset && q.offset > 0) sql += ` OFFSET ${Math.floor(q.offset)}`;
 	return {
 		table,
-		params: w.params,
+		params: [...w.params, ...facet.params],
 		sql
 	};
 }
@@ -168,6 +200,9 @@ function buildTwoDimensionDetail(q) {
 		clause += ` AND query = ?`;
 		params.push(q.filter.query);
 	}
+	const facet = facetPredicate(q);
+	clause += facet.sql;
+	params.push(...facet.params);
 	let sql = `SELECT url, query, ${q.metrics.map(metricExpr).join(", ")} FROM ${TABLE_PLACEHOLDER} WHERE ${clause} GROUP BY url, query`;
 	if (q.orderBy) sql += ` ORDER BY ${orderMetricExpr(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
 	if (q.limit && q.limit > 0) sql += ` LIMIT ${Math.floor(q.limit)}`;
@@ -198,7 +233,8 @@ function resolveServerTailEngine(query) {
 	if (cls === "cloud-only") throw new ServerTailRoutingError(`archetype '${query.archetype}' is cloud-only — not a server-tail query`);
 	if (cls === "duckdb") return "duckdb";
 	if (query.archetype === "top-n-breakdown" && query.offset && query.offset > 0) return "duckdb";
-	if (query.facets && query.facets.length > 0) return "duckdb";
+	const facets = query.facets;
+	if (facets && facets.length > 0) return "duckdb";
 	return "r2-sql";
 }
 function sourceFor(engine) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.25.8",
+  "version": "0.25.10",
   "description": "Cloudflare-Workers-flavored helpers for the gscdump analytics stack: AnalyticsEnv binding contract, R2 SigV4 presigner, size-hint HMAC, DuckDB Workers shims, engine factory.",
   "author": {
     "name": "Harlan Wilton",
@@ -46,11 +46,11 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/contracts": "0.25.8",
-    "@gscdump/engine": "0.25.8",
-    "@gscdump/engine-sqlite": "0.25.8",
-    "@gscdump/sdk": "0.25.8",
-    "gscdump": "0.25.8"
+    "@gscdump/contracts": "0.25.10",
+    "@gscdump/engine-sqlite": "0.25.10",
+    "@gscdump/sdk": "0.25.10",
+    "gscdump": "0.25.10",
+    "@gscdump/engine": "0.25.10"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.16.10",