@bitcobblers/wod-wiki-wql 0.9.40 → 0.10.42

package/dist/index.cjs

@@ -281,7 +281,10 @@ function parseJoinClause(where) {
     if (fp.window?.kind === "range") {
       return { error: "Range windows are not supported on join halves \u2014 use last <n>d|w" };
     }
-    return { find: { target: fp.target, filters: fp.filters, last: fp.window?.kind === "relative" ? { size: fp.window.size, unit: fp.window.unit } : void 0 } };
+    return {
+      find: { target: fp.target, filters: fp.filters, last: fp.window?.kind === "relative" ? { size: fp.window.size, unit: fp.window.unit } : void 0 },
+      advisories: fp.advisories
+    };
   }
   const m = CMP_RE.exec(where.trim());
   if (!m) return { error: cannotParseJoin(where) };
@@ -342,6 +345,12 @@ function normalizeWql(raw) {
         head = `${head}{source:${scope}}`;
       }
       const parts = [head];
+      if (suffixes.groupBy) {
+        parts.push(`by {${suffixes.groupBy.join(", ")}}`);
+      }
+      if (suffixes.rollup) {
+        parts.push(`.rollup(${suffixes.rollup.raw})`);
+      }
       if (suffixes.window) {
         parts.push(suffixes.window.raw);
       }
@@ -363,7 +372,8 @@ function validateRowsFilters(filters) {
     (f) => !allowedKeys.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.`;
+    const allowed = [...WQL_ROWS_SCOPE_KEYS, "source"];
+    return `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact ${allowed.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(", ")}.`;
@@ -379,7 +389,7 @@ function validateSourceFilter(filters) {
       if (validSources.has(val) || val === "collection" || val === "feed" || val.startsWith("collection:") || val.startsWith("feed:")) {
         continue;
       }
-      return `Unknown source "${val}". Try: ${WQL_SOURCE_VALUES.join(", ")}`;
+      return `Unknown source "${val}". Try: ${WQL_SOURCE_VALUES.join(", ")} (or collection:<id>, feed:<id>)`;
     }
   }
   return void 0;
@@ -587,6 +597,9 @@ function parseAnalyticsQuery(raw) {
       base.error = join.error;
       return base;
     }
+    if (join.advisories?.length) {
+      base.advisories = [...base.advisories ?? [], ...join.advisories];
+    }
     if (!join.find) {
       base.error = `Cross-store join on an analytics query must be find:\u2026, got "${whereText}"`;
       return base;
@@ -682,6 +695,64 @@ function parseFindQuery(raw) {
   return result;
 }
 
+// src/serialize.ts
+function serializeValue(value) {
+  if (/^[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)?$/.test(value)) return value;
+  return `"${value}"`;
+}
+function serializeFilters(filters) {
+  return filters.map((f) => `${f.negate ? "!" : ""}${f.key}:${f.values.map((v) => serializeValue(v.value) + (v.wildcard ? "*" : "")).join("|")}`).join(",");
+}
+function serializeAggHead(agg, metric, filters) {
+  return `${agg}:${metric}{${serializeFilters(filters)}}`;
+}
+function serializeAggregateHead(a) {
+  return serializeAggHead(a.agg, a.metric, a.filters);
+}
+function serializeFindHalf(target, filters, last) {
+  const head = `find:${target}${filters.length ? `{${serializeFilters(filters)}}` : ""}`;
+  return last ? `${head} last ${last.size}${last.unit}` : head;
+}
+function serializeMetricHalf(j) {
+  return `${serializeAggHead(j.agg, j.metric, j.filters)} ${j.operator} ${j.threshold}`;
+}
+function serializeFindHead(f) {
+  return serializeFindHalf(f.target, f.filters);
+}
+function serializeRowsHead(r) {
+  return `rows:${r.outputType ?? "all"}{${serializeFilters(r.filters)}}`;
+}
+function serializeWindow(w) {
+  if (!w) return "";
+  if (w.kind === "relative") return `last ${w.size}${w.unit}`;
+  return w.end ? `from ${w.start} to ${w.end}` : `from ${w.start}`;
+}
+function serialize(parsed) {
+  if (parsed.error) return parsed.raw;
+  if (parsed.family === "aggregate") {
+    const a = parsed;
+    let text = serializeAggregateHead(a);
+    if (a.groupBy.length) text += ` by {${a.groupBy.join(", ")}}`;
+    if (a.rollup) text += `.rollup(${a.rollup.size}${a.rollup.unit})`;
+    if (a.displayUnit) text += ` in ${a.displayUnit}`;
+    const win = serializeWindow(a.window);
+    if (win) text += ` ${win}`;
+    if (a.join) text += ` where ${serializeFindHalf(a.join.target, a.join.filters, a.join.last)}`;
+    return text;
+  }
+  if (parsed.family === "find") {
+    const parts = [serializeFindHead(parsed), serializeWindow(parsed.window)];
+    if (parsed.join) parts.push(`where ${serializeMetricHalf(parsed.join)}`);
+    return parts.filter(Boolean).join(" ");
+  }
+  if (parsed.family === "rows") {
+    const win = serializeWindow(parsed.window);
+    return [serializeRowsHead(parsed), win].filter(Boolean).join(" ");
+  }
+  const unhandled = parsed;
+  return unhandled.raw ?? "";
+}
+
 // src/disciplines.ts
 var EFFORT_DISCIPLINES = [
   "bodyweight",
@@ -1590,9 +1661,9 @@ var QueryService = class {
     if (this.staticNoteStore) {
       notes = notes.concat(await this.staticNoteStore.getAllNotes());
     }
+    notes = applySourceFilter(notes, parsed.filters);
     const selectedCount = notes.length;
     const anchorNow = windowAnchor(notes, parsed, options2);
-    notes = applySourceFilter(notes, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "tags" && !filter.negate) {
         const matchingIds = /* @__PURE__ */ new Set();
@@ -1652,9 +1723,9 @@ var QueryService = class {
     if (this.staticBlockStore) {
       blocks = blocks.concat(await this.staticBlockStore.getAllBlocks());
     }
+    blocks = applySourceFilter(blocks, parsed.filters);
     const selectedCount = blocks.length;
     const anchorNow = windowAnchor(blocks, parsed, options2);
-    blocks = applySourceFilter(blocks, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "text" && !filter.negate) {
         const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
@@ -2251,13 +2322,13 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.9.40";
-var GIT_SHA = "2462ec9";
-var BUILD_TIME = "2026-08-26T01:04:47.412Z";
+var VERSION = "0.10.42";
+var GIT_SHA = "79c6d18";
+var BUILD_TIME = "2026-08-26T04:44:54.356Z";
 var SEMVER = {
-  version: "0.9.40",
-  gitSha: "2462ec9",
-  buildTime: "2026-08-26T01:04:47.412Z"
+  version: "0.10.42",
+  gitSha: "79c6d18",
+  buildTime: "2026-08-26T04:44:54.356Z"
 };
 
 exports.BUILD_TIME = BUILD_TIME;
@@ -2326,6 +2397,7 @@ exports.referencedTokens = referencedTokens;
 exports.resolveCanonicalMetricKey = resolveCanonicalMetricKey;
 exports.resolveDisplayUnit = resolveDisplayUnit;
 exports.resolveWidgetType = resolveWidgetType;
+exports.serialize = serialize;
 exports.serializeFrontmatter = serializeFrontmatter;
 exports.setDashboardTokenValue = setDashboardTokenValue;
 exports.splitAtWhere = splitAtWhere;