@gscdump/engine-duckdb-wasm 0.35.9 → 0.35.11

package/dist/index.mjs

@@ -193,13 +193,14 @@ function compileArchetypeSql(query) {
 			const where = rangePredicate(query);
 			const cmp = compareRangePredicate(query);
 			const dir = query.orderBy.dir === "asc" ? "ASC" : "DESC";
+			const compareOrder = `COALESCE(c.${query.orderBy.metric}, 0) ${dir}`;
 			const metricList = query.metrics.includes(query.orderBy.metric) ? query.metrics : [...query.metrics, query.orderBy.metric];
 			const variantSel = query.dimension === "queryCanonical" ? ", COUNT(DISTINCT query) AS variantCount" : "";
 			if (query.dimension === "device") {
 				if (cmp) {
 					const curCols = metricList.map((m) => coalesceMetric(m, "c", m)).join(", ");
 					const prevCols = STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ");
-					let sql = `WITH cur AS (${deviceUnpivotSql(metricList, where.sql, false)}), prev AS (${deviceUnpivotSql(STD_METRICS, cmp.sql, false)}) SELECT COALESCE(c.device, p.device) AS device, ${curCols}, ${prevCols} FROM cur c FULL OUTER JOIN prev p ON c.device = p.device ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
+					let sql = `WITH cur AS (${deviceUnpivotSql(metricList, where.sql, false)}), prev AS (${deviceUnpivotSql(STD_METRICS, cmp.sql, false)}) SELECT COALESCE(c.device, p.device) AS device, ${curCols}, ${prevCols} FROM cur c FULL OUTER JOIN prev p ON c.device = p.device ORDER BY ${compareOrder} LIMIT ?`;
 					const params = [
 						...where.params,
 						...where.params,
@@ -245,7 +246,7 @@ function compileArchetypeSql(query) {
 				const variantOut = query.dimension === "queryCanonical" ? ", c.variantCount AS variantCount" : "";
 				const mover = query.movers ? moverClause(query.movers) : null;
 				const moverWhere = mover ? `WHERE ${mover.where} ` : "";
-				const orderSql = mover ? mover.order : `${query.orderBy.metric} ${dir}`;
+				const orderSql = mover ? mover.order : compareOrder;
 				let sql = `WITH cur AS (SELECT ${col} AS k, ${metricSelectList(metricList)}${variantSel} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col}), prev AS (SELECT ${col} AS k, ${metricSelectList(STD_METRICS)} FROM ${table} WHERE ${cmp.sql}${facet.sql} GROUP BY ${col}) SELECT COALESCE(c.k, p.k) AS ${query.dimension}, ${curCols}, ${prevCols}${variantOut}${totalCol} FROM cur c FULL OUTER JOIN prev p ON c.k = p.k ${moverWhere}ORDER BY ${orderSql} LIMIT ?`;
 				const params = [
 					...where.params,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "0.35.9",
+  "version": "0.35.11",
   "description": "DuckDB-WASM engine adapter for @gscdump/analysis — typed browser analytics against parquet via R2.",
   "author": {
     "name": "Harlan Wilton",
@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "drizzle-orm": "1.0.0-rc.3",
-    "@gscdump/contracts": "0.35.9",
-    "@gscdump/engine": "0.35.9",
-    "gscdump": "0.35.9"
+    "@gscdump/contracts": "0.35.11",
+    "@gscdump/engine": "0.35.11",
+    "gscdump": "0.35.11"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",