@gscdump/engine 6.0.0 → 7.1.0

package/dist/resolver/compile.mjs

@@ -29,12 +29,9 @@ function withMinimumImpressions(state, options) {
 }
 function orderByClause(state, prefix = "", columnOverride) {
 	const ties = dimensionOrder(state.dimensions, state.orderBy?.column, prefix);
-	if (state.orderBy) {
-		const safeCol = (columnOverride ?? state.orderBy.column).replace(/\W/g, "");
-		const safeDir = state.orderBy.dir.toUpperCase() === "ASC" ? "ASC" : "DESC";
-		return sql.raw(`ORDER BY ${prefix}${safeCol} ${safeDir}${ties}`);
-	}
-	return sql.raw(`ORDER BY ${prefix}clicks DESC${ties}`);
+	const column = typeof columnOverride === "object" ? columnOverride : sql.raw(`${prefix}${(columnOverride ?? state.orderBy?.column ?? "clicks").replace(/\W/g, "")}`);
+	const safeDir = state.orderBy?.dir.toUpperCase() === "ASC" ? "ASC" : "DESC";
+	return sql`ORDER BY ${column} ${sql.raw(`${safeDir}${ties}`)}`;
 }
 function dimensionOrder(dimensions, primary, prefix = "") {
 	return [...new Set(dimensions)].filter((d) => d !== primary).map((d) => `, ${prefix}"${d.replace(/\W/g, "")}" ASC`).join("");
@@ -227,7 +224,9 @@ function resolveToSQL(state, options) {
 	let body = wherePredicates.length > 0 ? sql`SELECT ${joinComma(selectExprs)} FROM ${table} WHERE ${joinAnd(wherePredicates)}` : sql`SELECT ${joinComma(selectExprs)} FROM ${table}`;
 	if (groupByExprs.length > 0) body = sql`${body} GROUP BY ${joinComma(groupByExprs)}`;
 	if (having.length > 0) body = sql`${body} HAVING ${joinAnd(having)}`;
-	const mainQuery = sql`${body} ${orderByClause(state)} ${limitOffsetClause(state)}`;
+	const sortColumn = state.orderBy?.column ?? "clicks";
+	const sortAggregate = adapter.isMetricDimension(sortColumn) && !metrics.includes(sortColumn) ? adapter.metricSql(sortColumn, tableKey) : void 0;
+	const mainQuery = sql`${body} ${orderByClause(state, "", sortAggregate)} ${limitOffsetClause(state)}`;
 	let countQuery;
 	if (groupByExprs.length > 0) {
 		let inner = wherePredicates.length > 0 ? sql`SELECT ${joinComma(groupByExprs)} FROM ${table} WHERE ${joinAnd(wherePredicates)} GROUP BY ${joinComma(groupByExprs)}` : sql`SELECT ${joinComma(groupByExprs)} FROM ${table} GROUP BY ${joinComma(groupByExprs)}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine",
   "type": "module",
-  "version": "6.0.0",
+  "version": "7.1.0",
   "description": "Append-only Parquet/DuckDB storage engine + planner + adapters for the gscdump pipeline. Node + edge runtimes; opt-in heavy peers.",
   "author": {
     "name": "Harlan Wilton",
@@ -189,10 +189,10 @@
     }
   },
   "dependencies": {
-    "@gscdump/contracts": "^6.0.0",
-    "@gscdump/lakehouse": "^6.0.0",
+    "@gscdump/contracts": "^7.1.0",
+    "@gscdump/lakehouse": "^7.1.0",
     "drizzle-orm": "1.0.0-rc.4",
-    "gscdump": "^6.0.0",
+    "gscdump": "^7.1.0",
     "pathe": "^2.0.3",
     "proper-lockfile": "^4.1.2"
   },