@bitcobblers/wod-wiki-wql 0.6.36 → 0.7.38

package/dist/index.cjs

@@ -162,55 +162,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 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 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 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 {
@@ -220,17 +227,21 @@ function parseWqlSuffixes(raw) {
     groupBy,
     last,
     scope,
+    conflicts: conflicts.length ? conflicts : void 0,
     primaryText: text
   };
 }
 
 // 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)`;
@@ -281,6 +292,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;
@@ -361,6 +376,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: "",
@@ -369,6 +385,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;
@@ -424,12 +444,17 @@ function parseFindQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
   const { where: whereText, last, scope, primaryText: text } = suffixes;
   const result = {
+    family: "find",
     raw,
     target: "",
     filters: [],
     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) {
@@ -1278,7 +1303,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: []
@@ -1286,7 +1311,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: []
@@ -1608,6 +1633,7 @@ var QueryService = class {
     };
     const join = parsed.join;
     const findResult = await this.runFind({
+      family: "find",
       raw: "",
       target: join.target,
       filters: join.filters,
@@ -2026,13 +2052,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.38";
+var GIT_SHA = "172cc75";
+var BUILD_TIME = "2026-08-25T23:00:14.937Z";
 var SEMVER = {
-  version: "0.6.36",
-  gitSha: "c5ad2b0",
-  buildTime: "2026-08-24T20:14:33.951Z"
+  version: "0.7.38",
+  gitSha: "172cc75",
+  buildTime: "2026-08-25T23:00:14.937Z"
 };
 
 exports.BUILD_TIME = BUILD_TIME;
@@ -2075,6 +2101,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;