tplm-lang 0.3.5 → 0.3.6

package/dist/compiler/grid-spec-builder.js

@@ -461,15 +461,13 @@ function buildSiblingHeaders(node, plan, results, axis, currentPath, depth, pare
  * Format an aggregate name for display (e.g., "births sum" from "births", "sum")
  */
 function formatAggregateName(measure, aggregation) {
-    // For count/n without a measure, just return the aggregation name
-    // This handles cases like standalone "count" or "n"
+    // For count/n without a measure, just return "N"
     if (!measure || measure === "__pending__") {
         return aggregation === "count" ? "N" : aggregation;
     }
-    // For count with a measure (e.g., income.count), just return "N" since
-    // count doesn't really bind to a measure in Malloy
+    // For field-bound count (distinct count), show "field N"
     if (aggregation === "count") {
-        return "N";
+        return `${measure} N`;
     }
     return `${measure} ${aggregation}`;
 }

package/dist/compiler/malloy-generator.js

@@ -110,16 +110,33 @@ function buildNestedPivot(colGroupings, aggregates, indent) {
 function buildAggregates(aggregates, indent = 2) {
     const pad = ' '.repeat(indent);
     const aggs = aggregates.map(a => {
-        return `${a.name} is ${a.measure}.${a.aggregation}()`;
+        return `${a.name} is ${buildAggExpr(a.measure, a.aggregation)}`;
     });
     return `${pad}aggregate: ${aggs.join(', ')}`;
 }
+/** Build a Malloy aggregate expression (mirrors multi-query-utils buildAggExpression) */
+function buildAggExpr(measure, aggregation) {
+    if (aggregation === 'count') {
+        if (measure && measure !== '__pending__' && measure !== '') {
+            return `count(${escapeForMalloy(measure)})`;
+        }
+        return 'count()';
+    }
+    if (!measure || measure === '__pending__')
+        return 'count()';
+    const methodMap = { mean: 'avg', stdev: 'stddev', pct: 'sum', pctn: 'count', pctsum: 'sum' };
+    return `${measure}.${methodMap[aggregation] ?? aggregation}()`;
+}
+const MALLOY_RESERVED = new Set(['all', 'and', 'as', 'asc', 'avg', 'by', 'case', 'cast', 'count', 'day', 'desc', 'dimension', 'else', 'end', 'exclude', 'extend', 'false', 'from', 'group', 'having', 'hour', 'import', 'is', 'join', 'limit', 'max', 'measure', 'min', 'minute', 'month', 'nest', 'not', 'now', 'null', 'number', 'on', 'or', 'order', 'pick', 'quarter', 'run', 'second', 'source', 'sum', 'then', 'true', 'week', 'when', 'where', 'year']);
+function escapeForMalloy(name) {
+    return MALLOY_RESERVED.has(name.toLowerCase()) ? `\`${name}\`` : name;
+}
 /**
  * Build total aggregate for column totals.
  */
 function buildTotalAggregate(aggregates, label) {
     const aggs = aggregates.map(a => {
-        return `${a.name} is ${a.measure}.${a.aggregation}()`;
+        return `${a.name} is ${buildAggExpr(a.measure, a.aggregation)}`;
     });
     const nestName = label ? `"${label}"` : '"total"';
     return `  nest: total is { aggregate: ${aggs.join(', ')} }`;

package/dist/compiler/multi-query-utils.d.ts

@@ -16,7 +16,12 @@ export declare function escapeFieldName(name: string): string;
  */
 export declare function escapeWhereExpression(expr: string): string;
 /**
- * Build a Malloy aggregate expression from measure and aggregation
+ * Build a Malloy aggregate expression from measure and aggregation.
+ *
+ * Count semantics:
+ * - Standalone `count` or `n` (no measure) → `count()` — counts all rows
+ * - Field-bound `user_id.count` (with measure) → `count(user_id)` — counts distinct values
+ *   This matches Malloy's native semantics where count(field) = COUNT(DISTINCT field).
  */
 export declare function buildAggExpression(measure: string, aggregation: string): string;
 /**

package/dist/compiler/multi-query-utils.js

@@ -86,16 +86,21 @@ const AGG_METHOD_MAP = {
     pctsum: 'sum',
 };
 /**
- * Build a Malloy aggregate expression from measure and aggregation
+ * Build a Malloy aggregate expression from measure and aggregation.
+ *
+ * Count semantics:
+ * - Standalone `count` or `n` (no measure) → `count()` — counts all rows
+ * - Field-bound `user_id.count` (with measure) → `count(user_id)` — counts distinct values
+ *   This matches Malloy's native semantics where count(field) = COUNT(DISTINCT field).
  */
 export function buildAggExpression(measure, aggregation) {
     const malloyMethod = AGG_METHOD_MAP[aggregation] ?? aggregation;
-    // Handle count - in Malloy, count() doesn't take a measure argument
-    // count() counts all rows, not a specific field
-    // When users write "income.count" or "income.n", they semantically mean "count"
-    // since you can't "count" a measure - you can only count rows
+    // Handle count: standalone = row count, field-bound = distinct count
     if (aggregation === 'count') {
-        return 'count()';
+        if (measure && measure !== '__pending__' && measure !== '') {
+            return `count(${escapeFieldName(measure)})`; // distinct count of field
+        }
+        return 'count()'; // standalone row count
     }
     // Handle other aggregations without a measure (use placeholder)
     // Also handle the __pending__ placeholder used for standalone count

package/dist/index.cjs

@@ -6536,6 +6536,9 @@ var AGG_METHOD_MAP = {
 function buildAggExpression(measure, aggregation) {
   const malloyMethod = AGG_METHOD_MAP[aggregation] ?? aggregation;
   if (aggregation === "count") {
+    if (measure && measure !== "__pending__" && measure !== "") {
+      return `count(${escapeFieldName(measure)})`;
+    }
     return "count()";
   }
   if (!measure || measure === "__pending__") {
@@ -8760,7 +8763,7 @@ function formatAggregateName(measure, aggregation) {
     return aggregation === "count" ? "N" : aggregation;
   }
   if (aggregation === "count") {
-    return "N";
+    return `${measure} N`;
   }
   return `${measure} ${aggregation}`;
 }
@@ -10206,6 +10209,17 @@ ${ordinalPick}`);
 }
 
 // packages/renderer/grid-renderer.ts
+function formatAggDisplayName(agg) {
+  if (agg.label) return agg.label;
+  if (agg.aggregation === "count") {
+    if (agg.measure && agg.measure !== "__pending__" && agg.measure !== "") {
+      return `${agg.measure} N`;
+    }
+    return "N";
+  }
+  if (!agg.measure || agg.measure === "__pending__") return agg.aggregation;
+  return `${agg.measure} ${agg.aggregation}`;
+}
 function renderGridToHTML(grid, options = {}) {
   const {
     tableClass = "tpl-table",
@@ -10288,7 +10302,7 @@ function renderColumnHeaders(grid, lines, showDimensionLabels) {
         lines.push('<th class="tpl-corner"></th>');
       }
     }
-    lines.push(`<th>${escapeHTML(grid.aggregates[0]?.label ?? grid.aggregates[0]?.name ?? "Value")}</th>`);
+    lines.push(`<th>${escapeHTML(grid.aggregates[0] ? formatAggDisplayName(grid.aggregates[0]) : "Value")}</th>`);
     lines.push("</tr>");
     lines.push("</thead>");
     return;
@@ -10320,7 +10334,7 @@ function renderColumnHeaders(grid, lines, showDimensionLabels) {
       lines.push("<th>Value</th>");
     } else {
       for (const agg of grid.aggregates) {
-        lines.push(`<th>${escapeHTML(agg.label ?? agg.name)}</th>`);
+        lines.push(`<th>${escapeHTML(formatAggDisplayName(agg))}</th>`);
       }
     }
     lines.push("</tr>");
@@ -10537,23 +10551,13 @@ function buildHumanPath(rowValues, colValues, aggregateName, aggregates) {
     if (aggInfo?.label) {
       displayAgg = aggInfo.label;
     } else if (aggInfo) {
-      if (aggInfo.aggregation === "count") {
-        displayAgg = "count";
-      } else {
-        displayAgg = `${aggInfo.measure}.${aggInfo.aggregation}`;
-      }
+      displayAgg = formatAggDisplayName(aggInfo);
     } else {
       displayAgg = aggregateName.replace(/^__pending___/, "").replace(/_/g, ".");
     }
   } else if (aggregates.length === 1) {
     const aggInfo = aggregates[0];
-    if (aggInfo.label) {
-      displayAgg = aggInfo.label;
-    } else if (aggInfo.aggregation === "count") {
-      displayAgg = "count";
-    } else {
-      displayAgg = `${aggInfo.measure}.${aggInfo.aggregation}`;
-    }
+    displayAgg = formatAggDisplayName(aggInfo);
   }
   if (displayAgg) {
     return dimPath ? `${dimPath} \u2192 ${displayAgg}` : displayAgg;

package/dist/renderer/grid-renderer.js

@@ -6,6 +6,25 @@
  * Key simplification: GridSpec already has the complete header hierarchy
  * with pre-computed spans, so we don't need to reconstruct structure.
  */
+/**
+ * Format an aggregate's display name.
+ * - Standalone count/n → "N"
+ * - field.count (distinct count) → "field N"
+ * - field.sum → "field sum"
+ */
+function formatAggDisplayName(agg) {
+    if (agg.label)
+        return agg.label;
+    if (agg.aggregation === 'count') {
+        if (agg.measure && agg.measure !== '__pending__' && agg.measure !== '') {
+            return `${agg.measure} N`;
+        }
+        return 'N';
+    }
+    if (!agg.measure || agg.measure === '__pending__')
+        return agg.aggregation;
+    return `${agg.measure} ${agg.aggregation}`;
+}
 /**
  * Render a GridSpec to HTML.
  */
@@ -118,7 +137,7 @@ function renderColumnHeaders(grid, lines, showDimensionLabels) {
             }
         }
         // Single aggregate header
-        lines.push(`<th>${escapeHTML(grid.aggregates[0]?.label ?? grid.aggregates[0]?.name ?? 'Value')}</th>`);
+        lines.push(`<th>${escapeHTML(grid.aggregates[0] ? formatAggDisplayName(grid.aggregates[0]) : 'Value')}</th>`);
         lines.push('</tr>');
         lines.push('</thead>');
         return;
@@ -159,7 +178,7 @@ function renderColumnHeaders(grid, lines, showDimensionLabels) {
         else {
             // Aggregates are not on row axis, render each aggregate as a column header
             for (const agg of grid.aggregates) {
-                lines.push(`<th>${escapeHTML(agg.label ?? agg.name)}</th>`);
+                lines.push(`<th>${escapeHTML(formatAggDisplayName(agg))}</th>`);
             }
         }
         lines.push('</tr>');
@@ -505,13 +524,7 @@ function buildHumanPath(rowValues, colValues, aggregateName, aggregates) {
             displayAgg = aggInfo.label;
         }
         else if (aggInfo) {
-            // Build display from measure + aggregation
-            if (aggInfo.aggregation === 'count') {
-                displayAgg = 'count';
-            }
-            else {
-                displayAgg = `${aggInfo.measure}.${aggInfo.aggregation}`;
-            }
+            displayAgg = formatAggDisplayName(aggInfo);
         }
         else {
             // Fallback: clean up the internal name
@@ -523,15 +536,7 @@ function buildHumanPath(rowValues, colValues, aggregateName, aggregates) {
     else if (aggregates.length === 1) {
         // Single aggregate - still show it in tooltip
         const aggInfo = aggregates[0];
-        if (aggInfo.label) {
-            displayAgg = aggInfo.label;
-        }
-        else if (aggInfo.aggregation === 'count') {
-            displayAgg = 'count';
-        }
-        else {
-            displayAgg = `${aggInfo.measure}.${aggInfo.aggregation}`;
-        }
+        displayAgg = formatAggDisplayName(aggInfo);
     }
     if (displayAgg) {
         return dimPath ? `${dimPath} → ${displayAgg}` : displayAgg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tplm-lang",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "TPLm - Table Producing Language backed by Malloy.",
   "type": "module",
   "main": "./dist/index.cjs",