@bitcobblers/wod-wiki-ui 0.7.38 → 0.9.40

package/dist/{chunk-3ANAQJ6S.mjs → chunk-LEM2Y37Q.mjs}

@@ -4,7 +4,7 @@ import { tags, styleTags, Tag } from '@lezer/highlight';
 import { RangeSetBuilder, Facet, StateEffect, StateField, Prec, EditorState, EditorSelection, countColumn } from '@codemirror/state';
 import { linter, forEachDiagnostic } from '@codemirror/lint';
 import { whiteboardScriptLanguage, createParser, getAnalyticsFromLogs, whiteboardScript } from '@bitcobblers/wod-wiki-lang';
-import { WQL_SOURCES, WQL_AGGREGATORS, WQL_ROLLUP_PERIODS, WQL_VIRTUAL_DIMS, WQL_TAG_KEYS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_CALC_TARGETS, WQL_DISPLAY_UNITS, WQL_INTENSITY_TIERS, parseQueryWidgetSuffix, WQL_COMPARISON_OPS, parseQuery, isRowsQuery, isDashboardWidgetType, unknownWidgetTypeMessage, resolveWidgetType, PLANNED_WIDGET_TYPES, parseWqlSuffixes, isFindQuery, isAggregateQuery, splitWidgetBody, substituteTokens, unknownTokensMessage, wql, wqlLanguage } from '@bitcobblers/wod-wiki-wql';
+import { WQL_SOURCES, WQL_AGGREGATORS, WQL_ROLLUP_PERIODS, WQL_VIRTUAL_DIMS, WQL_TAG_KEYS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_CALC_TARGETS, WQL_DISPLAY_UNITS, WQL_INTENSITY_TIERS, parseQueryWidgetSuffix, WQL_COMPARISON_OPS, parseQuery, isRowsQuery, isDashboardWidgetType, unknownWidgetTypeMessage, resolveWidgetType, PLANNED_WIDGET_TYPES, parseWqlSuffixes, WQL_FIND_TARGETS, isFindQuery, isAggregateQuery, splitWidgetBody, substituteTokens, unknownTokensMessage, wql, wqlLanguage } from '@bitcobblers/wod-wiki-wql';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { snippet, autocompletion, closeBrackets, closeBracketsKeymap, CompletionContext, ifNotIn, completeFromList, snippetCompletion } from '@codemirror/autocomplete';
@@ -1460,7 +1460,7 @@ function dispatchExpandRuntimePanel(view, sectionId, expanded) {
 
 // src/extensions/sessionQueryBlock.ts
 function sessionQueryWql(resultId) {
-  return `rows:{result:${resultId}}`;
+  return `rows:all{result:${resultId}}`;
 }
 function sessionQueryInsert(state, blockId, resultId, runBlock) {
   const sections = state.field(sectionField).sections;
@@ -1809,7 +1809,7 @@ function RowsResultsChrome({
       return;
     }
     let cancelled = false;
-    const wideQuery = parseQuery(`rows:{block:${blockContentId2}}`);
+    const wideQuery = parseQuery(`rows:all{block:${blockContentId2}}`);
     if (!isRowsQuery(wideQuery)) return;
     void executor.runRows(wideQuery).then((res) => {
       if (!cancelled) setWideResult(res);
@@ -3004,7 +3004,7 @@ function clausesToWql(clauses) {
   const filterBraces = filterParts.length > 0 ? `{${filterParts.join(", ")}}` : "";
   const source = clauseValue(clauses, "source", "notes");
   if (source === "rows") {
-    const output = clauseValue(clauses, "output", "");
+    const output = clauseValue(clauses, "output", "") || "all";
     const timeClause2 = clauses.find((c) => c.type === "time");
     let timeStr2 = "";
     if (timeClause2 && timeClause2.value && timeClause2.value !== "all") {
@@ -3111,7 +3111,8 @@ function restoreFilters(rest) {
 function wqlToClauses(wql2) {
   const suffixes = 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;
@@ -3120,7 +3121,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
     ];
@@ -3130,20 +3131,24 @@ function wqlToClauses(wql2) {
     const headMatch2 = RESTORE_FIND_HEAD_RE.exec(primaryText);
     if (!headMatch2) return null;
     const targetValue = headMatch2[1];
+    if (!WQL_FIND_TARGETS.includes(targetValue)) return null;
     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];
@@ -3650,10 +3655,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
   };
@@ -10369,5 +10376,5 @@ function editorPreset(optionsOrDialect = "markdown") {
 }
 
 export { AGG_OPTIONS, AddCalcDropdown, AddFilterDropdown, CLAUSE_META, CONTENT_SOURCES, ClausePopover, ComposerRegistry, CustomSlotPopover, DEFAULT_DIAGNOSTICS_DEBOUNCE_MS, DefaultFrontmatterWidget, GROUPBY_OPTIONS, GoalRings, METRIC_OPTIONS, MULTI_VALUE_TYPES, ProposedMetricBadge, QueryBlockView, QueryValue, ROLLUP_OPTIONS, RowsResultsChrome, RowsTable, SERIES_COLORS, SOURCE_OPTIONS, SUGGESTION_BINDINGS, StackedBar, TIME_OPTIONS, TokenSlotPill, TopList, UNIT_OPTIONS, WHERE_AGGREGATORS, WHERE_METRICS, WHERE_OPERATORS, WidgetChart, WidgetProblemBadge, WqlBars, WqlComposer, WqlDiagnosticsStrip, WqlEmptyState, WqlQueryInspectorModal, WqlTable, WqlTimeseries, ZoneDistribution, activeCursorSection, addRuntimePanel, blockContentId, blockTypesFromBlocks, catalogIdsFromBlocks, clauseToWql, clauseValue, clausesToWql, cn, compactNumber, composerRegistry, configureOverlayActions, cursorFocusExtension, dateRangeSlot, defaultClauses, defaultMetricsClauses, diagnoseClauses, dispatchAddRuntimePanel, dispatchExpandRuntimePanel, dispatchGutterHighlights, dispatchRemoveRuntimePanel, editingWidgetsField, editorPreset, editorTheme, embedPreviewDecorations, expandRuntimePanel, extractBlockQueries, fenceCompletion, findQueryBlockSection, findWorkoutErrors, forceSectionParse, formatTimestamp, frontmatterPreview, frontmatterPreviewField, getClauseMeta, getCursorFocusState, getOverlayActions, getSuggestionBinding, gutterHighlightsField, gutterUnified, handleFenceAutoWrap, hashCode, inlineButtonDecoration, invalidateSuggestions, lineIdsExtension, linkOpen, loadSuggestions, markdownSyntaxHiding, markdownTablePreview, mergeSeries, mergeTagSuggestions, navigationFacet, patchBlockQuery, pivotClauses, previewDecorations, queryBlockPreview, readSessionRpe, removeRuntimePanel, runtimePanelField, saveBlockQuerySource, sectionAtPos, sectionField, sectionGeometry, sessionQueryInsert, sessionQueryWql, setGutterHighlights, setMetricClause, setSuggestionBinding, smartIncrement, sourcePlane, summarizeAggregate, summarizeFind, tagsFromStaticBlocks, toggleWidgetEdit, tooltipTimestamp, urlAtPos, useChartShape, useComposerSlots, useSuggestions, useWqlStageCounts, widgetBlockPreview, wodAutoWrap, wodAutocompletion, wodEditorKeymap, wodLinter, wodOverlayPanel, workoutLintSource, wqlToClauses, wrapInTimeFence };
-//# sourceMappingURL=chunk-3ANAQJ6S.mjs.map
-//# sourceMappingURL=chunk-3ANAQJ6S.mjs.map
+//# sourceMappingURL=chunk-LEM2Y37Q.mjs.map
+//# sourceMappingURL=chunk-LEM2Y37Q.mjs.map