@bitcobblers/wod-wiki-ui 0.8.39 → 0.9.40

package/dist/extensions/index.cjs

@@ -3057,7 +3057,8 @@ function restoreFilters(rest) {
 function wqlToClauses(wql2) {
   const suffixes = wodWikiWql.parseWqlSuffixes(wql2.trim());
   if (suffixes.conflicts?.length) return null;
-  const { where, displayUnit, groupBy, rollup, last, scope, primaryText } = suffixes;
+  const { where, displayUnit, groupBy, rollup, window: window2, legacyScope, primaryText } = suffixes;
+  if (window2?.kind === "range") return null;
   const rowsMatch = /^rows(?:\:([a-zA-Z0-9_-]+))?\:?/.exec(primaryText);
   if (rowsMatch) {
     if (where || groupBy || rollup) return null;
@@ -3066,7 +3067,7 @@ function wqlToClauses(wql2) {
     if (!filterClauses2) return null;
     const clauses2 = [
       restoreClause("c-source", "source", "rows"),
-      restoreClause("c-time", "time", last ? `last ${last.size}${last.unit}` : "all"),
+      restoreClause("c-time", "time", window2?.kind === "relative" ? `last ${window2.size}${window2.unit}` : "all"),
       ...rowsMatch[1] ? [restoreClause("c-output", "output", rowsMatch[1])] : [],
       ...filterClauses2
     ];
@@ -3080,17 +3081,20 @@ function wqlToClauses(wql2) {
     const rest2 = primaryText.slice(headMatch2[0].length).trim();
     const filterClauses2 = restoreFilters(rest2);
     if (!filterClauses2) return null;
-    const timeValue = last ? `last ${last.size}${last.unit}` : "all";
-    const scopeValue = scope;
+    const timeValue = window2?.kind === "relative" ? `last ${window2.size}${window2.unit}` : "all";
+    const sourceClauseIdx = filterClauses2.findIndex((c) => c.type === "source");
+    const sourceFromFilter = sourceClauseIdx !== -1 ? filterClauses2[sourceClauseIdx].value : void 0;
+    const scopeValue = legacyScope ?? sourceFromFilter;
+    const remainingFilterClauses = sourceClauseIdx !== -1 ? filterClauses2.filter((_, idx) => idx !== sourceClauseIdx) : filterClauses2;
     const sourceValue = targetValue === "block" ? "blocks" : targetValue === "effort" ? "efforts" : !scopeValue || scopeValue === "all" ? "notes" : scopeValue;
     const clauses2 = [
       restoreClause("c-source", "source", sourceValue),
       restoreClause("c-time", "time", timeValue),
-      ...filterClauses2
+      ...remainingFilterClauses
     ];
-    if (where) clauses2.push(restoreClause("c-where", "where", where));
     return clauses2;
   }
+  if (window2) return null;
   const headMatch = RESTORE_AGG_HEAD_RE.exec(primaryText);
   if (!headMatch) return null;
   const aggValue = headMatch[1];
@@ -3592,10 +3596,12 @@ function AddCalcDropdown({
   ] });
 }
 function summarizeFind(ast) {
+  const sourceFilter = ast.filters.find((f) => f.key === "source");
+  const scope = sourceFilter ? sourceFilter.values.map((v) => v.value).join(",") : "all";
   return {
     target: ast.target,
-    scope: ast.scope || "all",
-    timeWindow: ast.last ? `last ${ast.last.size}${ast.last.unit}` : void 0,
+    scope,
+    timeWindow: ast.window ? ast.window.kind === "relative" ? `last ${ast.window.size}${ast.window.unit}` : `from ${ast.window.start}${ast.window.end ? ` to ${ast.window.end}` : ""}` : void 0,
     hasJoin: Boolean(ast.join),
     filterCount: ast.filters.length
   };