@gscdump/engine-duckdb-wasm 5.8.1 → 5.9.1

package/dist/archetype-sql.mjs

@@ -224,13 +224,14 @@ function compileArchetypeSql(query) {
 			const cmp = compareRangePredicate(query);
 			const dir = query.orderBy.dir === "asc" ? "ASC" : "DESC";
 			const compareOrder = `COALESCE(c.${query.orderBy.metric}, 0) ${dir}`;
+			const order = `${query.orderBy.metric} ${dir}, ${query.dimension} ASC`;
 			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 ${compareOrder} 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}, COALESCE(c.device, p.device) ASC LIMIT ?`;
 					const params = [
 						...where.params,
 						...where.params,
@@ -250,7 +251,7 @@ function compileArchetypeSql(query) {
 						params
 					};
 				}
-				let sql = `SELECT device, ${metricList.join(", ")} FROM (${deviceUnpivotSql(metricList, where.sql, false)}) ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
+				let sql = `SELECT device, ${metricList.join(", ")} FROM (${deviceUnpivotSql(metricList, where.sql, false)}) ORDER BY ${order} LIMIT ?`;
 				const params = [
 					...where.params,
 					...where.params,
@@ -277,7 +278,7 @@ function compileArchetypeSql(query) {
 				const mover = query.movers ? moverClause(query.movers) : null;
 				const moverWhere = mover ? `WHERE ${mover.where} ` : "";
 				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 ?`;
+				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}, COALESCE(c.k, p.k) ASC LIMIT ?`;
 				const params = [
 					...where.params,
 					...facet.params,
@@ -295,7 +296,7 @@ function compileArchetypeSql(query) {
 					params
 				};
 			}
-			let sql = `SELECT ${col} AS ${query.dimension}, ${metricSelectList(query.metrics)}${variantSel}${totalCol} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col} ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
+			let sql = `SELECT ${col} AS ${query.dimension}, ${metricSelectList(query.metrics)}${variantSel}${totalCol} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col} ORDER BY ${order} LIMIT ?`;
 			const params = [
 				...where.params,
 				...facet.params,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "5.8.1",
+  "version": "5.9.1",
   "description": "DuckDB-WASM engine adapter for @gscdump/analysis — typed browser analytics against parquet via R2.",
   "author": {
     "name": "Harlan Wilton",
@@ -44,10 +44,10 @@
     }
   },
   "dependencies": {
-    "@gscdump/contracts": "^5.8.1",
-    "@gscdump/engine": "^5.8.1",
+    "@gscdump/contracts": "^5.9.1",
+    "@gscdump/engine": "^5.9.1",
     "drizzle-orm": "1.0.0-rc.4",
-    "gscdump": "^5.8.1"
+    "gscdump": "^5.9.1"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "1.33.1-dev57.0",