@bitcobblers/wod-wiki-wql 0.6.36 → 0.7.37

package/dist/index.d.cts

@@ -164,6 +164,8 @@ interface ParsedWqlSuffixes {
     last?: ParsedWqlLastSuffix;
     /** Content scope (`in journal` / `in all`). */
     scope?: string;
+    /** Duplicate-clause diagnostics (C3) — each names both conflicting spans. */
+    conflicts?: string[];
     /** Primary query text with suffixes removed. */
     primaryText: string;
 }
@@ -945,13 +947,13 @@ declare function parseFrontmatterProps(lines: string[]): Record<string, string>;
  * Auto-generated build version metadata.
  * Do not edit directly; updated by scripts/stamp-version.ts
  */
-declare const VERSION = "0.6.36";
-declare const GIT_SHA = "c5ad2b0";
-declare const BUILD_TIME = "2026-08-24T20:14:33.951Z";
+declare const VERSION = "0.7.37";
+declare const GIT_SHA = "713c593";
+declare const BUILD_TIME = "2026-08-25T00:18:25.714Z";
 declare const SEMVER: {
-    readonly version: "0.6.36";
-    readonly gitSha: "c5ad2b0";
-    readonly buildTime: "2026-08-24T20:14:33.951Z";
+    readonly version: "0.7.37";
+    readonly gitSha: "713c593";
+    readonly buildTime: "2026-08-25T00:18:25.714Z";
 };
 
 export { type Aggregator, type AnyParsedQuery, BUILD_TIME, type BlockQueryStore, type ComparisonOp, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, type DashboardDocument, type DashboardMeta, type DashboardParsedSection, type DashboardSectionInput, type DashboardToken, type DashboardWidget, type DashboardWidgetType, EFFORT_DISCIPLINES, type EffortDiscipline, type EffortQueryStore, type EventRowIdentity, type FindOptions, type FindPredicate, type FindQueryResult, GIT_SHA, type IEffort, KG_PER_LB, type LinkWidget, type MetricPredicate, type NoteQueryStore, PLANNED_WIDGET_TYPES, type ParsedFindQuery, type ParsedFrontmatter, type ParsedQuery, type ParsedRowsQuery, type ParsedWqlLastSuffix, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, type RowsQueryResult, type RowsRun, SEMVER, type Series, type SeriesPoint, type SummaryFactIdentity, type SummaryFactSourceOutput, type TagFilter, type TagValue, UNIT_FAMILIES, type UnifiedEventStore, type UnitFamily, type UnitFamilyDef, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, type WqlAggregator, type WqlCalcTarget, type WqlComparisonOp, type WqlCompletionOptions, type WqlContentFilterKey, type WqlDisplayUnit, type WqlFindTarget, type WqlGrain, type WqlIntensityTier, type WqlKeyword, type WqlMetricAggregate, type WqlMetricFamily, type WqlRollupPeriod, type WqlScope, type WqlSource, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms as wqlTerms };

package/dist/index.d.ts

@@ -164,6 +164,8 @@ interface ParsedWqlSuffixes {
     last?: ParsedWqlLastSuffix;
     /** Content scope (`in journal` / `in all`). */
     scope?: string;
+    /** Duplicate-clause diagnostics (C3) — each names both conflicting spans. */
+    conflicts?: string[];
     /** Primary query text with suffixes removed. */
     primaryText: string;
 }
@@ -945,13 +947,13 @@ declare function parseFrontmatterProps(lines: string[]): Record<string, string>;
  * Auto-generated build version metadata.
  * Do not edit directly; updated by scripts/stamp-version.ts
  */
-declare const VERSION = "0.6.36";
-declare const GIT_SHA = "c5ad2b0";
-declare const BUILD_TIME = "2026-08-24T20:14:33.951Z";
+declare const VERSION = "0.7.37";
+declare const GIT_SHA = "713c593";
+declare const BUILD_TIME = "2026-08-25T00:18:25.714Z";
 declare const SEMVER: {
-    readonly version: "0.6.36";
-    readonly gitSha: "c5ad2b0";
-    readonly buildTime: "2026-08-24T20:14:33.951Z";
+    readonly version: "0.7.37";
+    readonly gitSha: "713c593";
+    readonly buildTime: "2026-08-25T00:18:25.714Z";
 };
 
 export { type Aggregator, type AnyParsedQuery, BUILD_TIME, type BlockQueryStore, type ComparisonOp, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, type DashboardDocument, type DashboardMeta, type DashboardParsedSection, type DashboardSectionInput, type DashboardToken, type DashboardWidget, type DashboardWidgetType, EFFORT_DISCIPLINES, type EffortDiscipline, type EffortQueryStore, type EventRowIdentity, type FindOptions, type FindPredicate, type FindQueryResult, GIT_SHA, type IEffort, KG_PER_LB, type LinkWidget, type MetricPredicate, type NoteQueryStore, PLANNED_WIDGET_TYPES, type ParsedFindQuery, type ParsedFrontmatter, type ParsedQuery, type ParsedRowsQuery, type ParsedWqlLastSuffix, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, type RowsQueryResult, type RowsRun, SEMVER, type Series, type SeriesPoint, type SummaryFactIdentity, type SummaryFactSourceOutput, type TagFilter, type TagValue, UNIT_FAMILIES, type UnifiedEventStore, type UnitFamily, type UnitFamilyDef, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, type WqlAggregator, type WqlCalcTarget, type WqlComparisonOp, type WqlCompletionOptions, type WqlContentFilterKey, type WqlDisplayUnit, type WqlFindTarget, type WqlGrain, type WqlIntensityTier, type WqlKeyword, type WqlMetricAggregate, type WqlMetricFamily, type WqlRollupPeriod, type WqlScope, type WqlSource, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms as wqlTerms };

package/dist/index.mjs

@@ -160,55 +160,62 @@ function parseWqlSuffixes(raw) {
   let groupBy;
   let last;
   let scope;
+  const conflicts = [];
   const isFind = text.startsWith("find:");
   const isRows = /^rows(?=[:{]|\s|$)/.test(text);
+  const stripRepeated = (re) => {
+    const matches = [];
+    for (let m = re.exec(text); m; m = re.exec(text)) {
+      matches.unshift(m);
+      text = text.slice(0, m.index).trim();
+    }
+    return matches;
+  };
+  const conflictFrom = (label, ms) => {
+    if (ms.length > 1) {
+      conflicts.push(
+        `Duplicate '${label}' clause: '${ms[0][0].trim()}' conflicts with '${ms[ms.length - 1][0].trim()}'`
+      );
+    }
+  };
   if (isFind || isRows) {
-    const lastMatch = LAST_RE.exec(text);
-    if (lastMatch) {
-      last = {
-        size: parseInt(lastMatch[1], 10),
-        unit: lastMatch[2].toLowerCase(),
-        raw: lastMatch[0].trim()
-      };
-      text = text.slice(0, lastMatch.index).trim();
+    const lasts = stripRepeated(LAST_RE);
+    conflictFrom("window", lasts);
+    if (lasts.length) {
+      const m = lasts[lasts.length - 1];
+      last = { size: parseInt(m[1], 10), unit: m[2].toLowerCase(), raw: m[0].trim() };
     }
     if (isFind) {
-      const scopeMatch = IN_SCOPE_RE.exec(text);
-      if (scopeMatch) {
-        scope = scopeMatch[1];
-        text = text.slice(0, scopeMatch.index).trim();
-      }
+      const scopes = stripRepeated(IN_SCOPE_RE);
+      conflictFrom("scope", scopes);
+      if (scopes.length) scope = scopes[scopes.length - 1][1];
     } else {
-      const rollupMatch = ROLLUP_RE.exec(text);
-      if (rollupMatch) {
-        const rawRollup = rollupMatch[1] + rollupMatch[2];
-        rollup = { size: rollupMatch[1] ? parseInt(rollupMatch[1], 10) : 1, unit: rollupMatch[2] || "", raw: rawRollup };
-        text = text.slice(0, rollupMatch.index).trim();
+      const rollups = stripRepeated(ROLLUP_RE);
+      conflictFrom(".rollup", rollups);
+      if (rollups.length) {
+        const m = rollups[rollups.length - 1];
+        rollup = { size: m[1] ? parseInt(m[1], 10) : 1, unit: m[2] || "", raw: m[1] + m[2] };
       }
-      const byMatch = BY_RE.exec(text);
-      if (byMatch) {
-        groupBy = byMatch[1].split(",").map((d) => d.trim()).filter(Boolean);
-        text = text.slice(0, byMatch.index).trim();
+      const bys = stripRepeated(BY_RE);
+      conflictFrom("by", bys);
+      if (bys.length) {
+        groupBy = bys[bys.length - 1][1].split(",").map((d) => d.trim()).filter(Boolean);
       }
     }
   } else {
-    const unitMatch = DISPLAY_UNIT_RE.exec(text);
-    if (unitMatch) {
-      displayUnit = unitMatch[1];
-      text = text.slice(0, unitMatch.index).trim();
+    const units = stripRepeated(DISPLAY_UNIT_RE);
+    conflictFrom("display-unit", units);
+    if (units.length) displayUnit = units[units.length - 1][1];
+    const rollups = stripRepeated(ROLLUP_RE);
+    conflictFrom(".rollup", rollups);
+    if (rollups.length) {
+      const m = rollups[rollups.length - 1];
+      rollup = { size: m[1] ? parseInt(m[1], 10) : 1, unit: m[2] || "", raw: m[1] + m[2] };
     }
-    const rollupMatch = ROLLUP_RE.exec(text);
-    if (rollupMatch) {
-      const rawRollup = rollupMatch[1] + rollupMatch[2];
-      const size = rollupMatch[1] ? parseInt(rollupMatch[1], 10) : 1;
-      const unit = rollupMatch[2] || "";
-      rollup = { size, unit, raw: rawRollup };
-      text = text.slice(0, rollupMatch.index).trim();
-    }
-    const byMatch = BY_RE.exec(text);
-    if (byMatch) {
-      groupBy = byMatch[1].split(",").map((d) => d.trim()).filter(Boolean);
-      text = text.slice(0, byMatch.index).trim();
+    const bys = stripRepeated(BY_RE);
+    conflictFrom("by", bys);
+    if (bys.length) {
+      groupBy = bys[bys.length - 1][1].split(",").map((d) => d.trim()).filter(Boolean);
     }
   }
   return {
@@ -218,6 +225,7 @@ function parseWqlSuffixes(raw) {
     groupBy,
     last,
     scope,
+    conflicts: conflicts.length ? conflicts : void 0,
     primaryText: text
   };
 }
@@ -279,6 +287,10 @@ function parseRowsQuery(raw) {
     filters: [],
     last: last ? { size: last.size, unit: last.unit } : void 0
   };
+  if (suffixes.conflicts?.length) {
+    result.error = suffixes.conflicts.join("; ");
+    return result;
+  }
   if (whereText || groupBy || rollup) {
     result.error = `Rows queries return raw statements \u2014 no where / by / rollup. Got "${primaryText.trim()}"`;
     return result;
@@ -367,6 +379,10 @@ function parseAnalyticsQuery(raw) {
     displayUnit,
     rollup: rollup ? { size: rollup.size, unit: rollup.unit } : void 0
   };
+  if (suffixes.conflicts?.length) {
+    base.error = suffixes.conflicts.join("; ");
+    return base;
+  }
   if (rollup && rollup.unit !== "d" && rollup.unit !== "w") {
     base.error = cannotParse(text);
     return base;
@@ -428,6 +444,10 @@ function parseFindQuery(raw) {
     scope,
     last: last ? { size: last.size, unit: last.unit } : void 0
   };
+  if (suffixes.conflicts?.length) {
+    result.error = suffixes.conflicts.join("; ");
+    return result;
+  }
   const tree = parser.parse(text);
   let syntaxError = false;
   tree.iterate({ enter(node) {
@@ -2024,13 +2044,13 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.6.36";
-var GIT_SHA = "c5ad2b0";
-var BUILD_TIME = "2026-08-24T20:14:33.951Z";
+var VERSION = "0.7.37";
+var GIT_SHA = "713c593";
+var BUILD_TIME = "2026-08-25T00:18:25.714Z";
 var SEMVER = {
-  version: "0.6.36",
-  gitSha: "c5ad2b0",
-  buildTime: "2026-08-24T20:14:33.951Z"
+  version: "0.7.37",
+  gitSha: "713c593",
+  buildTime: "2026-08-25T00:18:25.714Z"
 };
 
 export { BUILD_TIME, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, KG_PER_LB, PLANNED_WIDGET_TYPES, QueryService, SEMVER, UNIT_FAMILIES, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms };