@gscdump/cloudflare 0.24.0 → 0.25.0

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

@@ -1,6 +1,8 @@
-import { IcebergTableName } from "@gscdump/engine";
 import { ArchetypeQuery, ArchetypeResult, ArchetypeResultRow } from "@gscdump/sdk";
+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. */
 interface ArchetypeSqlPlan {
   /** SQL with `{{TABLE}}` standing in for the table reference. */
@@ -10,6 +12,13 @@ interface ArchetypeSqlPlan {
   /** The Iceberg fact table this query reads. */
   table: IcebergTableName;
 }
+/**
+ * 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>;
 /**
@@ -161,4 +170,4 @@ interface ServerTailDispatcher {
  * executor and routes every `ArchetypeQuery` to one of them.
  */
 declare function createServerTailDispatcher(config: ServerTailDispatcherConfig): ServerTailDispatcher;
-export { type ArchetypeSqlPlan, DuckDbIcebergError, type DuckDbIcebergExecutor, type DuckDbIcebergExecutorConfig, type DuckDbIcebergResult, type DuckDbIcebergRow, DuckDbIcebergTimeoutError, type DuckDbSvc, type R2SqlClient, type R2SqlClientConfig, R2SqlError, type R2SqlResult, type R2SqlRow, R2SqlTimeoutError, type ServerTailDispatcher, type ServerTailDispatcherConfig, type ServerTailEngine, ServerTailRoutingError, createDuckDbIcebergExecutor, createR2SqlClient, createServerTailDispatcher, resolveServerTailEngine };
+export { type ArchetypeSqlPlan, DuckDbIcebergError, type DuckDbIcebergExecutor, type DuckDbIcebergExecutorConfig, type DuckDbIcebergResult, type DuckDbIcebergRow, DuckDbIcebergTimeoutError, type DuckDbSvc, type R2SqlClient, type R2SqlClientConfig, R2SqlError, type R2SqlResult, type R2SqlRow, R2SqlTimeoutError, type ServerTailDispatcher, type ServerTailDispatcherConfig, type ServerTailEngine, ServerTailRoutingError, TABLE_PLACEHOLDER, buildArchetypeSql, createDuckDbIcebergExecutor, createR2SqlClient, createServerTailDispatcher, resolveServerTailEngine };

package/dist/server-tail/index.mjs

@@ -1,56 +1,5 @@
 import { bindLiterals, inferTable } from "@gscdump/engine";
 import { ARCHETYPE_EXECUTION_CLASS } from "@gscdump/sdk";
-var ServerTailRoutingError = class extends Error {
-	name = "ServerTailRoutingError";
-};
-function resolveServerTailEngine(query) {
-	const cls = ARCHETYPE_EXECUTION_CLASS[query.archetype];
-	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";
-	return "r2-sql";
-}
-function sourceFor(engine) {
-	return engine === "r2-sql" ? "server-r2-sql" : "server-duckdb";
-}
-function createServerTailDispatcher(config) {
-	function route(query) {
-		return resolveServerTailEngine(query);
-	}
-	async function execute(query, directive) {
-		const engine = route(query);
-		if (directive && directive.engine !== engine && engine === "r2-sql") return runOn("duckdb", query);
-		return runOn(engine, query);
-	}
-	async function runOn(engine, query) {
-		if (engine === "r2-sql") {
-			const res = await config.r2Sql.runArchetype(query);
-			return {
-				archetype: query.archetype,
-				rows: res.rows,
-				source: sourceFor("r2-sql"),
-				meta: {
-					rowCount: res.rows.length,
-					queryMs: res.queryMs
-				}
-			};
-		}
-		const res = await config.duckdb.runArchetype(query);
-		return {
-			archetype: query.archetype,
-			rows: res.rows,
-			source: sourceFor("duckdb"),
-			meta: {
-				rowCount: res.rows.length,
-				queryMs: res.queryMs
-			}
-		};
-	}
-	return {
-		route,
-		execute
-	};
-}
 const TABLE_PLACEHOLDER = "{{TABLE}}";
 function dimColumn(dim) {
 	if (dim === "page") return "url";
@@ -270,6 +219,57 @@ function buildArchetypeSql(query) {
 		case "aux-cloud-only": throw new Error("buildArchetypeSql: aux-cloud-only is not an Iceberg query");
 	}
 }
+var ServerTailRoutingError = class extends Error {
+	name = "ServerTailRoutingError";
+};
+function resolveServerTailEngine(query) {
+	const cls = ARCHETYPE_EXECUTION_CLASS[query.archetype];
+	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";
+	return "r2-sql";
+}
+function sourceFor(engine) {
+	return engine === "r2-sql" ? "server-r2-sql" : "server-duckdb";
+}
+function createServerTailDispatcher(config) {
+	function route(query) {
+		return resolveServerTailEngine(query);
+	}
+	async function execute(query, directive) {
+		const engine = route(query);
+		if (directive && directive.engine !== engine && engine === "r2-sql") return runOn("duckdb", query);
+		return runOn(engine, query);
+	}
+	async function runOn(engine, query) {
+		if (engine === "r2-sql") {
+			const res = await config.r2Sql.runArchetype(query);
+			return {
+				archetype: query.archetype,
+				rows: res.rows,
+				source: sourceFor("r2-sql"),
+				meta: {
+					rowCount: res.rows.length,
+					queryMs: res.queryMs
+				}
+			};
+		}
+		const res = await config.duckdb.runArchetype(query);
+		return {
+			archetype: query.archetype,
+			rows: res.rows,
+			source: sourceFor("duckdb"),
+			meta: {
+				rowCount: res.rows.length,
+				queryMs: res.queryMs
+			}
+		};
+	}
+	return {
+		route,
+		execute
+	};
+}
 var DuckDbIcebergError = class extends Error {
 	name = "DuckDbIcebergError";
 };
@@ -445,4 +445,4 @@ function createR2SqlClient(config) {
 		runArchetype
 	};
 }
-export { DuckDbIcebergError, DuckDbIcebergTimeoutError, R2SqlError, R2SqlTimeoutError, ServerTailRoutingError, createDuckDbIcebergExecutor, createR2SqlClient, createServerTailDispatcher, resolveServerTailEngine };
+export { DuckDbIcebergError, DuckDbIcebergTimeoutError, R2SqlError, R2SqlTimeoutError, ServerTailRoutingError, TABLE_PLACEHOLDER, buildArchetypeSql, createDuckDbIcebergExecutor, createR2SqlClient, createServerTailDispatcher, resolveServerTailEngine };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.24.0",
+  "version": "0.25.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,15 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/contracts": "0.24.0",
-    "@gscdump/engine-sqlite": "0.24.0",
-    "@gscdump/engine": "0.24.0",
-    "@gscdump/sdk": "0.24.0",
-    "gscdump": "0.24.0"
+    "@gscdump/contracts": "0.25.0",
+    "@gscdump/engine": "0.25.0",
+    "@gscdump/engine-sqlite": "0.25.0",
+    "@gscdump/sdk": "0.25.0",
+    "gscdump": "0.25.0"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.16.10",
-    "@cloudflare/workers-types": "^4.20260527.1",
+    "@cloudflare/workers-types": "^4.20260528.1",
     "h3": "^1.15.11",
     "typescript": "^6.0.3",
     "wrangler": "^4.95.0"