@gscdump/cloudflare 5.3.0 → 5.3.1

package/dist/server-tail/archetype-sql.d.mts

@@ -1,5 +1,6 @@
 import { ArchetypeQuery } from "@gscdump/contracts/archetypes";
 export declare const TABLE_PLACEHOLDER = "{{TABLE}}";
+export declare const COMPARISON_TABLE_PLACEHOLDER = "{{TABLE_PREVIOUS}}";
 export type ArchetypeFactTable = 'pages' | 'queries' | 'countries' | 'page_queries' | 'dates';
 export interface ArchetypeSqlPlan {
   sql: string;
@@ -9,6 +10,8 @@ export interface ArchetypeSqlPlan {
 export type PartitionPredicateMode = 'bare' | 'r2-sql-concat';
 export type PartitionKeyEncoding = 'int' | 'string';
 export interface BuildArchetypeSqlOptions {
+  /** Resolve comparison files independently from the current window. */
+  separateComparisonTable?: boolean;
   /**
    * Set by the DuckDB file-list executor, which reads raw Iceberg parquet
    * directly via `read_parquet([...])`, bypassing the catalog metadata layer

package/dist/server-tail/archetype-sql.mjs

@@ -1,7 +1,8 @@
 const TABLE_PLACEHOLDER = "{{TABLE}}";
+const COMPARISON_TABLE_PLACEHOLDER = "{{TABLE_PREVIOUS}}";
 const FACT_ALIAS = "fact";
-function factTableRef() {
-	return `${TABLE_PLACEHOLDER} AS ${FACT_ALIAS}`;
+function factTableRef(placeholder = TABLE_PLACEHOLDER) {
+	return `${placeholder} AS ${FACT_ALIAS}`;
 }
 function dimColumn(dim) {
 	if (dim === "page") return "url";
@@ -184,7 +185,8 @@ function buildEntityDailySparkline(q, pruned, mode) {
 		sql: `SELECT date, ${col} AS entity, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause} AND ${col} IN (${inList}) GROUP BY date, ${col} ORDER BY date ASC`
 	};
 }
-function buildTopNBreakdown(q, pruned, mode) {
+function buildTopNBreakdown(q, pruned, mode, separateComparisonTable = false) {
+	const previousTable = separateComparisonTable ? COMPARISON_TABLE_PLACEHOLDER : TABLE_PLACEHOLDER;
 	const table = tableForTopNBreakdown(q);
 	const w = partitionWhere(q, pruned, mode);
 	if (!q.orderBy || !q.orderBy.metric || !q.orderBy.dir) throw new Error(`[archetype-sql] top-n-breakdown requires orderBy.{metric,dir}, got: ${JSON.stringify(q.orderBy)}`);
@@ -204,13 +206,13 @@ function buildTopNBreakdown(q, pruned, mode) {
 				...q,
 				range: q.compareRange
 			}, pruned, mode);
-			const deviceSelects = (clause, ml) => DEVICE_SUFFIXES.map((suffix) => {
+			const deviceSelects = (clause, ml, placeholder = TABLE_PLACEHOLDER) => DEVICE_SUFFIXES.map((suffix) => {
 				const source = deviceSource(suffix);
 				const metrics = ml.map((m) => metricExprForSource(m, source)).join(", ");
-				return `SELECT '${suffix.toUpperCase()}' AS device, ${metrics} FROM ${factTableRef()} WHERE ${clause}`;
+				return `SELECT '${suffix.toUpperCase()}' AS device, ${metrics} FROM ${factTableRef(placeholder)} WHERE ${clause}`;
 			}).join(" UNION ALL ");
 			const inner = `SELECT COALESCE(c.device, p.device) AS device, ${metricList.map((m) => coalesceMetric(m, "c", m)).join(", ")}, ${STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ")} FROM cur c FULL OUTER JOIN prev p ON c.device = p.device`;
-			const sql = `WITH cur AS (${deviceSelects(w.clause, metricList)}), prev AS (${deviceSelects(wPrev.clause, STD_METRICS)}) SELECT * FROM (${inner}) t ORDER BY ${order} ${limit}${offset}`;
+			const sql = `WITH cur AS (${deviceSelects(w.clause, metricList)}), prev AS (${deviceSelects(wPrev.clause, STD_METRICS, previousTable)}) SELECT * FROM (${inner}) t ORDER BY ${order} ${limit}${offset}`;
 			return {
 				table,
 				params: [...DEVICE_SUFFIXES.flatMap(() => w.params), ...DEVICE_SUFFIXES.flatMap(() => wPrev.params)],
@@ -244,7 +246,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 		const moverWhere = q.movers ? `WHERE ${moverClause(q.movers).where} ` : "";
 		const outerOrder = q.movers ? moverOrderByAlias(q.movers) : order;
 		const inner = `SELECT COALESCE(c.k, p.k) AS ${q.dimension}, ${curCols}, ${prevCols}${variantOut}${totalCol} FROM cur c FULL OUTER JOIN prev p ON c.k = p.k ${moverWhere}`;
-		const sql = `WITH cur AS (SELECT ${col} AS k, ${curMetrics}${variantSel} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} GROUP BY ${col}), prev AS (SELECT ${col} AS k, ${prevMetrics} FROM ${factTableRef()} WHERE ${wPrev.clause}${facet.sql} GROUP BY ${col}) SELECT * FROM (${inner}) t ORDER BY ${outerOrder} ${limit}${offset}`;
+		const sql = `WITH cur AS (SELECT ${col} AS k, ${curMetrics}${variantSel} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} GROUP BY ${col}), prev AS (SELECT ${col} AS k, ${prevMetrics} FROM ${factTableRef(previousTable)} WHERE ${wPrev.clause}${facet.sql} GROUP BY ${col}) SELECT * FROM (${inner}) t ORDER BY ${outerOrder} ${limit}${offset}`;
 		return {
 			table,
 			params: [
@@ -334,7 +336,7 @@ function buildArchetypeSql(query, opts = {}) {
 		case "site-daily-timeseries": return buildSiteDailyTimeseries(query, pruned, mode);
 		case "entity-daily-timeseries": return buildEntityDailyTimeseries(query, pruned, mode);
 		case "entity-daily-sparkline": return buildEntityDailySparkline(query, pruned, mode);
-		case "top-n-breakdown": return buildTopNBreakdown(query, pruned, mode);
+		case "top-n-breakdown": return buildTopNBreakdown(query, pruned, mode, opts.separateComparisonTable);
 		case "single-row-lookup": return buildSingleRowLookup(query, pruned, mode);
 		case "multi-series-stacked-daily": return buildMultiSeriesStackedDaily(query, pruned, mode);
 		case "two-dimension-detail": return buildTwoDimensionDetail(query, pruned, mode);
@@ -342,4 +344,4 @@ function buildArchetypeSql(query, opts = {}) {
 		case "aux-cloud-only": throw new Error("buildArchetypeSql: aux-cloud-only is not an Iceberg query");
 	}
 }
-export { TABLE_PLACEHOLDER, buildArchetypeSql };
+export { COMPARISON_TABLE_PLACEHOLDER, TABLE_PLACEHOLDER, buildArchetypeSql };

package/dist/server-tail/index.d.mts

@@ -1,6 +1,6 @@
-import { ArchetypeSqlPlan, BuildArchetypeSqlOptions, TABLE_PLACEHOLDER, buildArchetypeSql } from "./archetype-sql.mjs";
+import { ArchetypeSqlPlan, BuildArchetypeSqlOptions, COMPARISON_TABLE_PLACEHOLDER, TABLE_PLACEHOLDER, buildArchetypeSql } from "./archetype-sql.mjs";
 import { DuckDbIcebergError, DuckDbIcebergExecutor, DuckDbIcebergExecutorConfig, DuckDbIcebergQueryError, DuckDbIcebergResult, DuckDbIcebergRow, DuckDbIcebergTimeoutError, DuckDbSvc, createDuckDbIcebergExecutor } from "./duckdb-iceberg-executor.mjs";
 import { R2SqlClient, R2SqlClientConfig, R2SqlError, R2SqlQueryError, R2SqlResult, R2SqlRow, R2SqlTimeoutError, createR2SqlClient, inlineParams } from "./r2-sql-client.mjs";
 import { ServerTailDispatcher, ServerTailDispatcherConfig, ServerTailEngine, ServerTailRoutingError, createServerTailDispatcher, resolveServerTailEngine, resolveServerTailEngineResult } from "./dispatcher.mjs";
 import { R2SqlTransport, R2SqlTransportConfig, R2SqlTransportMetrics, R2SqlTransportResult, R2SqlTransportRow, createR2SqlTransport } from "./r2-sql-transport.mjs";
-export { type ArchetypeSqlPlan, type BuildArchetypeSqlOptions, DuckDbIcebergError, type DuckDbIcebergExecutor, type DuckDbIcebergExecutorConfig, type DuckDbIcebergQueryError, type DuckDbIcebergResult, type DuckDbIcebergRow, DuckDbIcebergTimeoutError, type DuckDbSvc, type R2SqlClient, type R2SqlClientConfig, R2SqlError, type R2SqlQueryError, type R2SqlResult, type R2SqlRow, R2SqlTimeoutError, type R2SqlTransport, type R2SqlTransportConfig, type R2SqlTransportMetrics, type R2SqlTransportResult, type R2SqlTransportRow, type ServerTailDispatcher, type ServerTailDispatcherConfig, type ServerTailEngine, ServerTailRoutingError, TABLE_PLACEHOLDER, buildArchetypeSql, createDuckDbIcebergExecutor, createR2SqlClient, createR2SqlTransport, createServerTailDispatcher, inlineParams, resolveServerTailEngine, resolveServerTailEngineResult };
+export { type ArchetypeSqlPlan, type BuildArchetypeSqlOptions, COMPARISON_TABLE_PLACEHOLDER, DuckDbIcebergError, type DuckDbIcebergExecutor, type DuckDbIcebergExecutorConfig, type DuckDbIcebergQueryError, type DuckDbIcebergResult, type DuckDbIcebergRow, DuckDbIcebergTimeoutError, type DuckDbSvc, type R2SqlClient, type R2SqlClientConfig, R2SqlError, type R2SqlQueryError, type R2SqlResult, type R2SqlRow, R2SqlTimeoutError, type R2SqlTransport, type R2SqlTransportConfig, type R2SqlTransportMetrics, type R2SqlTransportResult, type R2SqlTransportRow, type ServerTailDispatcher, type ServerTailDispatcherConfig, type ServerTailEngine, ServerTailRoutingError, TABLE_PLACEHOLDER, buildArchetypeSql, createDuckDbIcebergExecutor, createR2SqlClient, createR2SqlTransport, createServerTailDispatcher, inlineParams, resolveServerTailEngine, resolveServerTailEngineResult };

package/dist/server-tail/index.mjs

@@ -1,6 +1,6 @@
-import { TABLE_PLACEHOLDER, buildArchetypeSql } from "./archetype-sql.mjs";
+import { COMPARISON_TABLE_PLACEHOLDER, TABLE_PLACEHOLDER, buildArchetypeSql } from "./archetype-sql.mjs";
 import { ServerTailRoutingError, createServerTailDispatcher, resolveServerTailEngine, resolveServerTailEngineResult } from "./dispatcher.mjs";
 import { DuckDbIcebergError, DuckDbIcebergTimeoutError, createDuckDbIcebergExecutor } from "./duckdb-iceberg-executor.mjs";
 import { createR2SqlTransport } from "./r2-sql-transport.mjs";
 import { R2SqlError, R2SqlTimeoutError, createR2SqlClient, inlineParams } from "./r2-sql-client.mjs";
-export { DuckDbIcebergError, DuckDbIcebergTimeoutError, R2SqlError, R2SqlTimeoutError, ServerTailRoutingError, TABLE_PLACEHOLDER, buildArchetypeSql, createDuckDbIcebergExecutor, createR2SqlClient, createR2SqlTransport, createServerTailDispatcher, inlineParams, resolveServerTailEngine, resolveServerTailEngineResult };
+export { COMPARISON_TABLE_PLACEHOLDER, DuckDbIcebergError, DuckDbIcebergTimeoutError, R2SqlError, R2SqlTimeoutError, ServerTailRoutingError, TABLE_PLACEHOLDER, buildArchetypeSql, createDuckDbIcebergExecutor, createR2SqlClient, createR2SqlTransport, createServerTailDispatcher, inlineParams, resolveServerTailEngine, resolveServerTailEngineResult };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "Cloudflare Workers helpers for server-tail queries and in-flight request deduplication.",
   "author": {
     "name": "Harlan Wilton",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@gscdump/contracts": "^5.3.0",
     "@gscdump/engine": "^5.3.0",
-    "gscdump": "^5.3.0"
+    "gscdump": "^5.3.1"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.22.0",