@gscdump/cloudflare 0.26.9 → 0.27.0

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

@@ -1,24 +1,13 @@
-import { ArchetypeQuery, ArchetypeResult, ArchetypeResultRow } from "@gscdump/sdk";
+import { ArchetypeQuery, ArchetypeResult, ArchetypeResultRow } from "@gscdump/contracts/archetypes";
 import { Result } from "gscdump/result";
-import { IcebergTableName } from "@gscdump/engine/iceberg";
 import { ServerTailDirective } from "@gscdump/contracts";
-/** Placeholder substituted for the engine-specific table reference. */
 declare const TABLE_PLACEHOLDER = "{{TABLE}}";
-/** A dialect-neutral SQL plan. */
+type ArchetypeFactTable = 'pages' | 'queries' | 'countries' | 'page_queries' | 'dates';
 interface ArchetypeSqlPlan {
-  /** SQL with `{{TABLE}}` standing in for the table reference. */
   sql: string;
-  /** Bound parameters, in `?`-order. */
   params: unknown[];
-  /** The Iceberg fact table this query reads. */
-  table: IcebergTableName;
+  table: ArchetypeFactTable;
 }
-/**
- * Translate an archetype query to a dialect-neutral SQL plan.
- *
- * Throws for `arbitrary-sql` (caller-supplied SQL, handled by the DuckDB
- * executor directly) and `aux-cloud-only` (not an Iceberg query).
- */
 declare function buildArchetypeSql(query: ArchetypeQuery): ArchetypeSqlPlan;
 /** Row returned by the DuckDB sibling. */
 type DuckDbIcebergRow = Record<string, string | number | null>;

package/dist/server-tail/index.mjs

@@ -1,5 +1,5 @@
-import { bindLiterals, inferTable } from "@gscdump/engine";
-import { ARCHETYPE_EXECUTION_CLASS } from "@gscdump/sdk";
+import { bindLiterals } from "@gscdump/engine";
+import { ARCHETYPE_EXECUTION_CLASS } from "@gscdump/contracts/archetypes";
 import { err, ok, unwrapResult } from "gscdump/result";
 const TABLE_PLACEHOLDER = "{{TABLE}}";
 function dimColumn(dim) {
@@ -7,6 +7,14 @@ function dimColumn(dim) {
 	if (dim === "queryCanonical") return "query_canonical";
 	return 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";
+	if (set.has("query") || set.has("queryCanonical")) return "queries";
+	if (set.has("country")) return "countries";
+	if (set.has("device")) return "dates";
+	return "pages";
+}
 function metricExpr(metric) {
 	switch (metric) {
 		case "clicks": return "SUM(clicks) AS clicks";
@@ -128,7 +136,7 @@ function buildSiteDailyTimeseries(q) {
 	};
 }
 function buildEntityDailyTimeseries(q) {
-	const table = inferTable([q.entity.dimension]);
+	const table = tableForDimensions([q.entity.dimension]);
 	const w = partitionWhere(q);
 	const col = dimColumn(q.entity.dimension);
 	const metrics = q.metrics.map(metricExpr).join(", ");
@@ -139,10 +147,10 @@ function buildEntityDailyTimeseries(q) {
 	};
 }
 function buildEntityDailySparkline(q) {
-	const table = inferTable([q.dimension]);
+	const table = tableForDimensions([q.dimension]);
 	const w = partitionWhere(q);
 	const col = dimColumn(q.dimension);
-	if (q.entities.length === 0) throw new Error("entity-daily-sparkline: empty entities — resolver must pre-resolve the top-N list");
+	if (q.entities.length === 0) throw new Error("entity-daily-sparkline: empty entities - resolver must pre-resolve the top-N list");
 	const inList = q.entities.map(sqlStringLiteral).join(", ");
 	return {
 		table,
@@ -151,7 +159,7 @@ function buildEntityDailySparkline(q) {
 	};
 }
 function buildTopNBreakdown(q) {
-	const table = inferTable([q.dimension]);
+	const table = tableForDimensions([q.dimension]);
 	const w = partitionWhere(q);
 	const order = `${q.orderBy.metric} ${q.orderBy.dir.toUpperCase()}`;
 	const limit = `LIMIT ${Math.max(0, Math.floor(q.limit))}`;
@@ -226,7 +234,7 @@ function buildTopNBreakdown(q) {
 }
 function buildSingleRowLookup(q) {
 	const dims = Object.keys(q.match);
-	const table = inferTable(dims);
+	const table = tableForDimensions(dims);
 	const w = partitionWhere(q);
 	const params = [...w.params];
 	let clause = w.clause;
@@ -243,7 +251,7 @@ function buildSingleRowLookup(q) {
 	};
 }
 function buildMultiSeriesStackedDaily(q) {
-	const table = inferTable([q.seriesDimension]);
+	const table = tableForDimensions([q.seriesDimension]);
 	const w = partitionWhere(q);
 	if (q.seriesDimension === "device") {
 		const selects = DEVICE_SUFFIXES.map((suffix) => {
@@ -296,7 +304,7 @@ function buildArchetypeSql(query) {
 		case "single-row-lookup": return buildSingleRowLookup(query);
 		case "multi-series-stacked-daily": return buildMultiSeriesStackedDaily(query);
 		case "two-dimension-detail": return buildTwoDimensionDetail(query);
-		case "arbitrary-sql": throw new Error("buildArchetypeSql: arbitrary-sql carries caller SQL — the DuckDB executor runs it verbatim");
+		case "arbitrary-sql": throw new Error("buildArchetypeSql: arbitrary-sql carries caller SQL - the DuckDB executor runs it verbatim");
 		case "aux-cloud-only": throw new Error("buildArchetypeSql: aux-cloud-only is not an Iceberg query");
 	}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.26.9",
+  "version": "0.27.0",
   "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,15 +46,14 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/engine-sqlite": "0.26.9",
-    "@gscdump/sdk": "0.26.9",
-    "@gscdump/contracts": "0.26.9",
-    "@gscdump/engine": "0.26.9",
-    "gscdump": "0.26.9"
+    "@gscdump/contracts": "0.27.0",
+    "@gscdump/engine": "0.27.0",
+    "@gscdump/engine-sqlite": "0.27.0",
+    "gscdump": "0.27.0"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.16.15",
-    "@cloudflare/workers-types": "^4.20260613.1",
+    "@cloudflare/workers-types": "^4.20260616.1",
     "h3": "^1.15.11",
     "typescript": "^6.0.3",
     "wrangler": "^4.100.0"