@gscdump/engine 0.12.0 → 0.13.1

package/dist/_chunks/resolver.mjs

@@ -199,6 +199,39 @@ function createSqlFragments(config) {
 		}
 		return preds;
 	}
+	function prefilterPredicates(filters, tableKey) {
+		const t = schema[tableKey];
+		const preds = [];
+		for (const f of filters) {
+			const metric = f.dimension;
+			let col;
+			if (metric === "clicks") col = t.clicks;
+			else if (metric === "impressions") col = t.impressions;
+			else if (metric === "position") col = t.sum_position;
+			if (!col) continue;
+			const v = Number(f.expression);
+			switch (f.operator) {
+				case "metricGte":
+					preds.push(sql`${col} >= ${v}`);
+					break;
+				case "metricGt":
+					preds.push(sql`${col} > ${v}`);
+					break;
+				case "metricLte":
+					preds.push(sql`${col} <= ${v}`);
+					break;
+				case "metricLt":
+					preds.push(sql`${col} < ${v}`);
+					break;
+				case "metricBetween": {
+					const v2 = Number(f.expression2);
+					preds.push(sql`${col} >= ${v} AND ${col} <= ${v2}`);
+					break;
+				}
+			}
+		}
+		return preds;
+	}
 	function dimensionPredicates(filters, tableKey) {
 		const preds = [];
 		for (const f of filters) {
@@ -250,6 +283,7 @@ function createSqlFragments(config) {
 		dimExprSql,
 		metricSql,
 		havingPredicates,
+		prefilterPredicates,
 		dimensionPredicates,
 		topLevelPredicate
 	};
@@ -272,6 +306,7 @@ function createResolverAdapter(config) {
 		metricSql: runtime.metricSql,
 		dimensionPredicates: runtime.dimensionPredicates,
 		havingPredicates: runtime.havingPredicates,
+		prefilterPredicates: runtime.prefilterPredicates,
 		topLevelPredicate: runtime.topLevelPredicate,
 		compile: config.compile
 	};
@@ -355,6 +390,7 @@ function buildScope(state, options) {
 	const tableKey = adapter.tableKeyForDataset(plan.dataset);
 	const dimFilters = toInternalDimensionFilters(plan.dimensionFilters);
 	const metricFilters = toInternalMetricFilters(plan.metricFilters);
+	const prefilters = toInternalMetricFilters(plan.prefilters);
 	const groupByDims = plan.groupByDimensions;
 	const hasDate = plan.hasDate;
 	const metrics = plan.metrics;
@@ -362,6 +398,7 @@ function buildScope(state, options) {
 	if (adapter.siteIdColRef && siteId != null) wherePredicates.push(sql`${adapter.siteIdColRef(tableKey)} = ${siteId}`);
 	wherePredicates.push(sql`${adapter.dateColRef(tableKey)} >= ${plan.dateRange.startDate}`);
 	wherePredicates.push(sql`${adapter.dateColRef(tableKey)} <= ${plan.dateRange.endDate}`);
+	wherePredicates.push(...adapter.prefilterPredicates(prefilters, tableKey));
 	const dimSql = plan.dimensionFilterTree ? compileFilterTree(plan.dimensionFilterTree, adapter, tableKey) : void 0;
 	if (dimSql) wherePredicates.push(dimSql);
 	else if (!plan.dimensionFilterTree) wherePredicates.push(...adapter.dimensionPredicates(dimFilters, tableKey));

package/dist/_chunks/types.d.mts

@@ -17,6 +17,7 @@ interface ResolverAdapter<TableKey extends string = string> {
   metricSql: (metric: Metric, tableKey: TableKey) => SQL;
   dimensionPredicates: (filters: InternalFilter[], tableKey: TableKey) => SQL[];
   havingPredicates: (filters: InternalFilter[], tableKey: TableKey) => SQL[];
+  prefilterPredicates: (filters: InternalFilter[], tableKey: TableKey) => SQL[];
   topLevelPredicate: (filters: InternalFilter[], tableKey: TableKey) => SQL | undefined;
   compile: (query: SQL) => {
     sql: string;

package/dist/resolver/index.d.mts

@@ -49,6 +49,7 @@ interface SqlFragments<TableKey extends string> {
   dimExprSql: (dim: Dimension, tableKey: TableKey) => SQL;
   metricSql: (metric: Metric, tableKey: TableKey) => SQL;
   havingPredicates: (filters: InternalFilter[], tableKey: TableKey) => SQL[];
+  prefilterPredicates: (filters: InternalFilter[], tableKey: TableKey) => SQL[];
   dimensionPredicates: (filters: InternalFilter[], tableKey: TableKey) => SQL[];
   topLevelPredicate: (filters: InternalFilter[], tableKey: TableKey) => SQL | undefined;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine",
   "type": "module",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "description": "Append-only Parquet/DuckDB storage engine + planner + adapters for the gscdump pipeline. Node + edge runtimes; opt-in heavy peers.",
   "author": {
     "name": "Harlan Wilton",
@@ -169,8 +169,8 @@
   "dependencies": {
     "drizzle-orm": "^0.45.2",
     "proper-lockfile": "^4.1.2",
-    "gscdump": "0.12.0",
-    "@gscdump/contracts": "0.12.0"
+    "@gscdump/contracts": "0.13.1",
+    "gscdump": "0.13.1"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",