@bitcobblers/wod-wiki-wql 0.7.37 → 0.8.39

package/dist/index.cjs

@@ -1,18 +1,16 @@
 'use strict';
 
+var wodWikiCore = require('@bitcobblers/wod-wiki-core');
 var lr = require('@lezer/lr');
 var language = require('@codemirror/language');
 var autocomplete = require('@codemirror/autocomplete');
 var highlight = require('@lezer/highlight');
-var wodWikiCore = require('@bitcobblers/wod-wiki-core');
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-
-// src/vocabulary.ts
 var WQL_METRIC_FAMILIES = ["reps", "distance", "resistance", "elapsed", "power", "pace"];
 var WQL_METRIC_AGGREGATES = ["totalVolume", "totalDistance", "tis", "sessionLoad"];
 var WQL_AGGREGATORS = ["sum", "avg", "min", "max", "count", "last", "delta"];
@@ -58,6 +56,9 @@ var WQL_INTENSITY_TIERS = ["low", "moderate", "high"];
 var WQL_GRAINS = ["summary", "event"];
 var WQL_FIND_TARGETS = ["note", "block", "effort"];
 var WQL_SCOPES = ["journal", "collections", "feeds", "all"];
+var WQL_RESULT_PLANES = wodWikiCore.KNOWN_OUTPUT_TYPES;
+var WQL_ROWS_TARGETS = [...WQL_FIND_TARGETS, ...WQL_RESULT_PLANES, "all"];
+var WQL_ROWS_SCOPE_KEYS = ["result", "block", "note"];
 var WQL_CONTENT_FILTER_KEYS = ["type", "text", "has", "source", "catalog", ...WQL_TAG_KEYS];
 var WQL_SOURCES = ["journal", "collections", "feeds", "notes", "blocks", "efforts", "metrics"];
 var WQL_ROLLUP_PERIODS = ["1d", "1w"];
@@ -234,11 +235,14 @@ function parseWqlSuffixes(raw) {
 
 // src/wql.ts
 function isFindQuery(parsed) {
-  return "target" in parsed;
+  return parsed.family === "find";
 }
 function isRowsQuery(parsed) {
   return parsed.family === "rows";
 }
+function isAggregateQuery(parsed) {
+  return parsed.family === "aggregate";
+}
 var AGGS = WQL_AGGREGATORS;
 function cannotParse(text) {
   return `Cannot parse "${text}". Expected agg:metric{filters} by {dims} .rollup(period)`;
@@ -278,14 +282,28 @@ function parseQuery(raw) {
   return parseAnalyticsQuery(raw);
 }
 function cannotParseRows(text) {
-  return `Cannot parse "${text}". Expected rows:{result:\u2026|block:\u2026|note:\u2026} or rows:segment{\u2026} last 8w`;
+  return `Cannot parse "${text}". Expected rows:all{result:\u2026|block:\u2026|note:\u2026}, rows:<plane>{\u2026}, or rows:segment{\u2026} last 8w`;
 }
+function validateRowsFilters(filters) {
+  const scopeKeys = new Set(WQL_ROWS_SCOPE_KEYS);
+  const unsupported = filters.filter(
+    (f) => !scopeKeys.has(f.key) || f.negate || f.values.some((v) => v.wildcard)
+  );
+  if (unsupported.length > 0) {
+    return `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact ${WQL_ROWS_SCOPE_KEYS.map((k) => `${k}:`).join(", ")} values.`;
+  }
+  if (!filters.some((f) => scopeKeys.has(f.key))) {
+    return `Rows query needs a scope: ${WQL_ROWS_SCOPE_KEYS.map((k) => `${k}:`).join(", ")}.`;
+  }
+  return void 0;
+}
+var BARE_ROWS_RETIRED = 'Bare "rows:" is retired \u2014 name a target: rows:all{\u2026} for every output type, or a plane like rows:segment{\u2026}.';
 function parseRowsQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
   const { where: whereText, last, groupBy, rollup, primaryText } = suffixes;
   const result = {
-    raw,
     family: "rows",
+    raw,
     filters: [],
     last: last ? { size: last.size, unit: last.unit } : void 0
   };
@@ -298,41 +316,48 @@ function parseRowsQuery(raw) {
     return result;
   }
   const text = primaryText.trim();
-  const brace = text.indexOf("{");
-  const head = (brace === -1 ? text : text.slice(0, brace)).trim();
-  const filterText = brace === -1 ? "" : text.slice(brace).trim();
-  if (head === "rows" || head === "rows:") ; else if (head.startsWith("rows:")) {
-    const target = head.slice("rows:".length).trim();
-    if (!target || /\s/.test(target)) {
-      result.error = cannotParseRows(text);
-      return result;
-    }
-    result.outputType = target;
-  } else {
+  if (/^rows:?\s*[{]?$/.test(text) || /^rows:?\s*[{]/.test(text)) {
+    result.error = BARE_ROWS_RETIRED;
+    return result;
+  }
+  const tree = parser.parse(text);
+  let syntaxError = false;
+  tree.iterate({ enter(node) {
+    if (node.type.isError) syntaxError = true;
+  } });
+  if (syntaxError) {
     result.error = cannotParseRows(text);
     return result;
   }
-  if (filterText) {
-    if (!/^\{.*\}$/.test(filterText)) {
-      result.error = cannotParseRows(text);
-      return result;
-    }
-    const synthetic = `find:_${filterText}`;
-    const tree = parser.parse(synthetic);
-    let syntaxError = false;
-    tree.iterate({ enter(node) {
-      if (node.type.isError) syntaxError = true;
-    } });
-    if (syntaxError) {
-      result.error = cannotParseRows(text);
-      return result;
-    }
-    result.filters = extractFilters(tree.topNode, synthetic);
-    const grainError = retiredGrainRollup(result.filters);
-    if (grainError) {
-      result.error = grainError;
-      return result;
-    }
+  const query = tree.topNode;
+  const head = query.getChild(Head);
+  const aggNode = head?.getChild(Aggregator);
+  const metricNode = head?.getChild(Metric);
+  if (!head || !aggNode || !metricNode) {
+    result.error = BARE_ROWS_RETIRED;
+    return result;
+  }
+  const aggText = text.slice(aggNode.from, aggNode.to);
+  if (aggText !== "rows") {
+    result.error = cannotParseRows(text);
+    return result;
+  }
+  const target = text.slice(metricNode.from, metricNode.to);
+  if (!WQL_ROWS_TARGETS.includes(target)) {
+    result.error = `Unknown rows target "${target}". Try: ${WQL_ROWS_TARGETS.join(", ")}`;
+    return result;
+  }
+  if (target !== "all") result.outputType = target;
+  result.filters = extractFilters(query, text);
+  const grainError = retiredGrainRollup(result.filters);
+  if (grainError) {
+    result.error = grainError;
+    return result;
+  }
+  const filterError = validateRowsFilters(result.filters);
+  if (filterError) {
+    result.error = filterError;
+    return result;
   }
   return result;
 }
@@ -373,6 +398,7 @@ function parseAnalyticsQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
   const { where: whereText, displayUnit, groupBy, rollup, primaryText: text } = suffixes;
   const base = {
+    family: "aggregate",
     raw,
     agg: "sum",
     metric: "",
@@ -440,6 +466,7 @@ function parseFindQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
   const { where: whereText, last, scope, primaryText: text } = suffixes;
   const result = {
+    family: "find",
     raw,
     target: "",
     filters: [],
@@ -473,6 +500,10 @@ function parseFindQuery(raw) {
     return result;
   }
   result.target = text.slice(metricNode.from, metricNode.to);
+  if (!WQL_FIND_TARGETS.includes(result.target)) {
+    result.error = `Unknown find target "${result.target}". Try: ${WQL_FIND_TARGETS.join(", ")}`;
+    return result;
+  }
   result.filters = extractFilters(query, text);
   const findGrainError = retiredGrainRollup(result.filters);
   if (findGrainError) {
@@ -1090,6 +1121,7 @@ function staticTagIndexFromBlocks(blocks) {
 
 // src/QueryService.ts
 var DAY = 864e5;
+var ROWS_CONTENT_PLANES = new Set(WQL_FIND_TARGETS);
 function localDateString(ts) {
   return new Date(ts).toLocaleDateString(void 0, { year: "numeric", month: "short", day: "numeric" });
 }
@@ -1298,7 +1330,7 @@ var QueryService = class {
     const parsed = parseQuery(raw);
     if (isFindQuery(parsed)) {
       return {
-        parsed: { raw, agg: "count", metric: parsed.target, filters: [], groupBy: [] },
+        parsed: { family: "aggregate", raw, agg: "count", metric: parsed.target, filters: [], groupBy: [] },
         series: [],
         stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
         matched: []
@@ -1306,7 +1338,7 @@ var QueryService = class {
     }
     if (isRowsQuery(parsed)) {
       return {
-        parsed: { raw, agg: "count", metric: "rows", filters: [], groupBy: [] },
+        parsed: { family: "aggregate", raw, agg: "count", metric: "rows", filters: [], groupBy: [] },
         series: [],
         stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
         matched: []
@@ -1315,29 +1347,20 @@ var QueryService = class {
     return this.run(parsed, options2);
   }
   /**
-   * Execute a rows query (rows:{…}, #949) — the session results table plane.
-   * Reads event rows directly over the unified store (ticket 003): no
-   * WorkoutResult blob parsing; outputType narrowing hits the promoted column.
+   * Execute a rows query (rows:<target>{…}, #949/C4) — the session results
+   * table plane. Filter rules are validated at parse; this executes only.
+   * Reads event rows directly over the unified store: outputType narrowing
+   * hits the promoted column; content-plane targets scope by content.
    */
   async runRows(parsed, options2 = {}) {
     const empty = { parsed, runs: [] };
     if (parsed.error) return { ...empty, error: parsed.error };
-    const ROWS_SCOPE_KEYS = /* @__PURE__ */ new Set(["result", "block", "note"]);
-    const unsupported = parsed.filters.filter(
-      (f) => !ROWS_SCOPE_KEYS.has(f.key) || f.negate || f.values.some((v) => v.wildcard)
-    );
-    if (unsupported.length > 0) {
-      return {
-        ...empty,
-        error: `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact result:, block:, note: values.`
-      };
-    }
     const scopeValues = (key) => parsed.filters.filter((f) => f.key === key).flatMap((f) => f.values.map((v) => v.value));
     const resultIds = scopeValues("result");
     const blockIds = scopeValues("block");
     const noteIds = scopeValues("note");
     if (resultIds.length + blockIds.length + noteIds.length === 0) {
-      return { ...empty, error: "Rows query needs a scope: result:, block:, or note:." };
+      return { ...empty, runs: [] };
     }
     const byResult = /* @__PURE__ */ new Map();
     const collect = (rows) => {
@@ -1361,7 +1384,7 @@ var QueryService = class {
       resultId,
       noteId: rows[0].noteId,
       timestamp: rows[0].timestamp,
-      events: parsed.outputType ? rows.filter((row) => row.outputType === parsed.outputType) : rows
+      events: parsed.outputType && !ROWS_CONTENT_PLANES.has(parsed.outputType) ? rows.filter((row) => row.outputType === parsed.outputType) : rows
     })).filter((run) => run.events.length > 0);
     return { parsed, runs };
   }
@@ -1628,6 +1651,7 @@ var QueryService = class {
     };
     const join = parsed.join;
     const findResult = await this.runFind({
+      family: "find",
       raw: "",
       target: join.target,
       filters: join.filters,
@@ -2046,13 +2070,13 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.7.37";
-var GIT_SHA = "713c593";
-var BUILD_TIME = "2026-08-25T00:18:25.714Z";
+var VERSION = "0.8.39";
+var GIT_SHA = "3c19185";
+var BUILD_TIME = "2026-08-26T00:07:31.934Z";
 var SEMVER = {
-  version: "0.7.37",
-  gitSha: "713c593",
-  buildTime: "2026-08-25T00:18:25.714Z"
+  version: "0.8.39",
+  gitSha: "3c19185",
+  buildTime: "2026-08-26T00:07:31.934Z"
 };
 
 exports.BUILD_TIME = BUILD_TIME;
@@ -2079,7 +2103,10 @@ exports.WQL_INTENSITY_TIERS = WQL_INTENSITY_TIERS;
 exports.WQL_KEYWORDS = WQL_KEYWORDS;
 exports.WQL_METRIC_AGGREGATES = WQL_METRIC_AGGREGATES;
 exports.WQL_METRIC_FAMILIES = WQL_METRIC_FAMILIES;
+exports.WQL_RESULT_PLANES = WQL_RESULT_PLANES;
 exports.WQL_ROLLUP_PERIODS = WQL_ROLLUP_PERIODS;
+exports.WQL_ROWS_SCOPE_KEYS = WQL_ROWS_SCOPE_KEYS;
+exports.WQL_ROWS_TARGETS = WQL_ROWS_TARGETS;
 exports.WQL_SCOPES = WQL_SCOPES;
 exports.WQL_SOURCES = WQL_SOURCES;
 exports.WQL_TAG_KEYS = WQL_TAG_KEYS;
@@ -2095,6 +2122,7 @@ exports.extractFrontmatterTags = extractFrontmatterTags;
 exports.getList = getList;
 exports.getScalar = getScalar;
 exports.getUnitFamily = getUnitFamily;
+exports.isAggregateQuery = isAggregateQuery;
 exports.isDashboardMeta = isDashboardMeta;
 exports.isDashboardWidgetType = isDashboardWidgetType;
 exports.isEffortDiscipline = isEffortDiscipline;