@bitcobblers/wod-wiki-wql 0.45.2166 → 0.46.2168

package/dist/index.cjs

@@ -31,7 +31,7 @@ var WQL_TAG_KEYS = [
   "result",
   "tags"
 ];
-var WQL_CONTENT_ONLY_KEYS = ["type", "text", "source", "notebook", "contributes"];
+var WQL_CONTENT_ONLY_KEYS = ["type", "text", "source", "notebook", "contributes", "feed", "subscribed"];
 var WQL_EFFORT_FILTER_KEYS = ["effort", "discipline", "intensity", "origin", "text"];
 var WQL_VIRTUAL_DIMS = ["day", "week", "session", "round"];
 var WQL_CALC_TARGETS = [
@@ -92,7 +92,7 @@ var WQL_FUNCTION_HEADS = WQL_AGGREGATORS;
 var WQL_CHART_HEADS = ["timeseries", "bar", "table", "donut", "toplist", "value"];
 var WQL_STANDARD_DATASETS = ["@session", "@today"];
 var WQL_RESULT_PLANES = wodWikiCore.KNOWN_OUTPUT_TYPES;
-var WQL_CONTENT_FILTER_KEYS = ["type", "text", "source", "notebook", "page", "contributes", ...WQL_TAG_KEYS];
+var WQL_CONTENT_FILTER_KEYS = ["type", "text", "source", "notebook", "page", "contributes", "feed", "subscribed", ...WQL_TAG_KEYS];
 var WQL_SOURCES = WQL_FIND_TARGETS;
 var WQL_ROLLUP_PERIODS = ["2w", "4w"];
 var WQL_DISPLAY_UNITS = ["kg", "lb"];
@@ -114,7 +114,7 @@ var WQL_KEYWORDS = [
 ];
 
 // src/capabilities.ts
-var CONTENT_GROUPING_DIMENSIONS = ["date", "day", "week", "month", "year", "discipline", "origin", "source", "notebook", "kind", "type", "tag"];
+var CONTENT_GROUPING_DIMENSIONS = ["date", "day", "week", "month", "year", "discipline", "origin", "source", "notebook", "kind", "type", "tag", "feed"];
 var STRUCTURAL_TYPES = { time: true, groupby: true, rollup: true, unit: true, where: true, agg: true };
 var FACT_KEYS = WQL_TAG_KEYS.filter((key) => key !== "metric");
 var TABLE_KEYS = WQL_TAG_KEYS.filter((key) => key !== "tags");
@@ -132,9 +132,9 @@ var TARGET_TYPES = {
   // The notebook plane IS the note plane (its executor delegates), so both
   // advertise the same member-criteria keys — container criteria (tags:,
   // effort:, typed tags, text:) narrow notebook results, never ignored.
-  notebook: /* @__PURE__ */ new Set(["text", "notebook", "tag", "effort", ...WQL_TYPED_TAG_KEYS, "type", "page", "source", "note", "time", "groupby", "where"]),
-  note: /* @__PURE__ */ new Set(["text", "notebook", "tag", "effort", ...WQL_TYPED_TAG_KEYS, "type", "page", "source", "note", "time", "groupby", "where"]),
-  block: /* @__PURE__ */ new Set(["text", "notebook", "tag", "effort", "type", "source", "note", "time", "groupby", "where"]),
+  notebook: /* @__PURE__ */ new Set(["text", "notebook", "tag", "effort", ...WQL_TYPED_TAG_KEYS, "type", "page", "source", "note", "time", "groupby", "where", "feed", "subscribed"]),
+  note: /* @__PURE__ */ new Set(["text", "notebook", "tag", "effort", ...WQL_TYPED_TAG_KEYS, "type", "page", "source", "note", "time", "groupby", "where", "feed", "subscribed"]),
+  block: /* @__PURE__ */ new Set(["text", "notebook", "tag", "effort", "type", "source", "note", "time", "groupby", "where", "feed", "subscribed"]),
   effort: /* @__PURE__ */ new Set([...WQL_EFFORT_FILTER_KEYS, "groupby"]),
   session: /* @__PURE__ */ new Set(["result", "block", "note", "plane", "time", "groupby"]),
   segment: /* @__PURE__ */ new Set([...TABLE_KEYS, "time", "groupby", "unit"]),
@@ -179,9 +179,9 @@ function supportsWqlFilterKey(target, family, rawKey) {
 }
 var parser = lr.LRParser.deserialize({
   version: 14,
-  states: "+^OVQPOOOOQO'#Cb'#CbObQPO'#C`OgQPO'#C`OlQPO'#ClOqQQO'#C_OOQO'#C_'#C_O!SQQO'#CnQOQPOOOOQO,58z,58zO!bQPO,58zOOQO,59W,59WO!gQPO'#CdOOQO,58y,58yOVQPO,58xO!rQPO'#CoO!wQPO'#CrOOQO,59Y,59YO!|QPO,59YO#UQQO'#CcOOQO1G.f1G.fOOQO'#Cg'#CgO#jQPO'#CeO#oQPO'#CeOOQO,59O,59OO#tQPO,59OO#|QPO'#C_O$XQPO1G.dO$aQPO,59ZO$iQQO,59^OOQO1G.t1G.tO$nQPO'#CuO$sQQO,58}O%XQPO,59PO%aQPO,59PO%fQPO'#CxO%nQPO1G.jOOQO1G.j1G.jOVQPO'#CyO%vQPO7+$OOOQO'#Cq'#CqOOQO1G.u1G.uO&OQPO1G.uO&WQPO1G.xOOQO,59a,59aOOQO-E6s-E6sO&]QPO'#CiO&qQPO'#CiO'PQPO'#ChOOQO1G.k1G.kO%XQPO1G.kOOQO,59d,59dOOQO-E6v-E6vOOQO7+$U7+$UO'[QPO'#CcOOQO,59e,59eOOQO-E6w-E6wO'jQPO'#CzO'oQPO7+$aOOQO7+$a7+$aO'wQPO7+$dO'|QPO'#CvO(RQPO,59TOOQO,59T,59TO%XQPO'#CwO(gQPO,59SOOQO7+$V7+$VO(rQPO,58}OOQO,59f,59fOOQO-E6x-E6xOOQO<<G{<<G{OOQO<<HO<<HOOOQO,59b,59bOOQO-E6t-E6tOOQO1G.o1G.oOOQO,59c,59cOOQO-E6u-E6uO)QQPO,58zO)VQPO'#C`",
-  stateData: ")[~OqOS~OTPOaSOrQO~OTXO~OrYO~OTZO~Ot[OdRXgRXoRXuRX~Od_Og`Ou^OobX~OTcO~OTeOYgOwhO~OtlO~OxmO~Og`Ooba~OsoOdVXgVXoVXtVXuVX~OrqO~OTeO~OvsOwuO~Ot[OoRXuRX~OuvOoQi~OTxOwyO~Oh{O~OT|O~OsoOdVagVaoVatVauVa~OT!OO_!PO~Or!SO~OTeOYgO~OvsOw!VO~OuvOoQq~Ov!ZOw!]O~OT!^O~O^!aOr!_Os!_Ou]Xv]Xw]X~O^!aOu]Xv]Xw]X~Ou!bOv[Xw[X~OsoOoVXtVXuVX~OTxO~Ov!ZOw!hO~Oy!iO~OT!jO~O^!lOr!_Os!_Ou]av]aw]a~Ou!bOv[aw[a~OsoOoVatVauVa~OT!WO~Or!oO~O",
-  goto: "$^oPPps|P!T![!`!dP!j!q!wPP#OPp#TP#W#^PP#d#n#t#z$Q$WRWOQVOQk^R!XvQTOTj^vQROT!p^vTdY!oT]TjQi[R!TsSf[sRrgQ!RqR!d!SS!Qq!SR!m!bVUO^vRbVQzlR!f!ZQaVRnbQpcS}p!eR!e!WQ!`!OR!k!`Q!c!QR!n!cQtiR!UtQwkR!YwQ![zR!g![",
+  states: "+dOVQPOOOOQO'#Cb'#CbObQPO'#C`OgQPO'#C`OlQPO'#ClOqQQO'#C_OOQO'#C_'#C_O!SQQO'#CnQOQPOOOOQO,58z,58zO!bQPO,58zOOQO,59W,59WO!gQPO'#CdOOQO,58y,58yOVQPO,58xO!rQPO'#CoO!wQPO'#CrOOQO,59Y,59YO!|QPO,59YO#UQQO'#CcOOQO1G.f1G.fOOQO'#Cg'#CgO#jQPO'#CeO#oQPO'#CeOOQO,59O,59OO#tQPO,59OO#|QPO'#C_O$XQPO1G.dO$aQPO,59ZO$iQQO,59^OOQO1G.t1G.tO$nQPO'#CuO$sQQO,58}O%XQPO,59PO%dQPO,59PO%iQPO'#CxO%qQPO1G.jOOQO1G.j1G.jOVQPO'#CyO%yQPO7+$OOOQO'#Cq'#CqOOQO1G.u1G.uO&RQPO1G.uO&ZQPO1G.xOOQO,59a,59aOOQO-E6s-E6sOOQO'#Ci'#CiO&`QPO'#CiO&tQPO'#CiO'SQPO'#ChOOQO1G.k1G.kO%XQPO1G.kOOQO,59d,59dOOQO-E6v-E6vOOQO7+$U7+$UO'_QPO'#CcOOQO,59e,59eOOQO-E6w-E6wO'mQPO'#CzO'rQPO7+$aOOQO7+$a7+$aO'zQPO7+$dO(PQPO'#CvO(UQPO,59TOOQO,59T,59TO%XQPO'#CwO(jQPO,59SOOQO7+$V7+$VO(uQPO,58}OOQO,59f,59fOOQO-E6x-E6xOOQO<<G{<<G{OOQO<<HO<<HOOOQO,59b,59bOOQO-E6t-E6tOOQO1G.o1G.oOOQO,59c,59cOOQO-E6u-E6uO)TQPO,58zO)YQPO'#C`",
+  stateData: ")_~OqOS~OTPOaSOrQO~OTXO~OrYO~OTZO~Ot[OdRXgRXoRXuRX~Od_Og`Ou^OobX~OTcO~OTeOYgOwhO~OtlO~OxmO~Og`Ooba~OsoOdVXgVXoVXtVXuVX~OrqO~OTeO~OvsOwuO~Ot[OoRXuRX~OuvOoQi~OTxOwyO~Oh{O~OT|O~OsoOdVagVaoVatVauVa~OT!PO^!OO_!QO~Or!TO~OTeOYgO~OvsOw!WO~OuvOoQq~Ov![Ow!^O~OT!_O~O^!bOr!`Os!`Ou]Xv]Xw]X~O^!bOu]Xv]Xw]X~Ou!cOv[Xw[X~OsoOoVXtVXuVX~OTxO~Ov![Ow!iO~Oy!jO~OT!kO~O^!mOr!`Os!`Ou]av]aw]a~Ou!cOv[aw[a~OsoOoVatVauVa~OT!XO~Or!pO~O",
+  goto: "$^oPPps|P!T![!`!dP!j!q!wPP#OPp#TP#W#^PP#d#n#t#z$Q$WRWOQVOQk^R!YvQTOTj^vQROT!q^vTdY!pT]TjQi[R!UsSf[sRrgQ!SqR!e!TS!Rq!TR!n!cVUO^vRbVQzlR!g![QaVRnbQpcS}p!fR!f!XQ!a!PR!l!aQ!d!RR!o!dQtiR!VtQwkR!ZwQ!]zR!h!]",
   nodeNames: "\u26A0 Query Pipeline Stage Head Word Aggregator Metric Filters Filter Negate TagKey TagValue Value Star Quoted DatasetReference At Single GroupBy By Dimension Rollup RollupDot Int",
   maxTerm: 41,
   skippedNodes: [0],
@@ -671,7 +671,7 @@ function validateSourceFilter(filters) {
         return `source:notebook is retired \u2014 :notebook{} is the notebook plane (every notebook); narrow it with the notebook: filter, e.g. :notebook{notebook:journal}.`;
       }
       if (val === "feed" || val === "feeds" || val.startsWith("feed:")) {
-        return `source:${val} is retired \u2014 the feed corpus is the notebook plane; use source:notebooks or notebook:<slug>.`;
+        return `source:${val} is retired \u2014 the feed corpus is the notebook plane; use feed:<feedId> or source:notebooks.`;
       }
       if (val === "collection" || val === "collections" || val.startsWith("collection:")) {
         return `source:${val} is retired \u2014 collections are notebooks; use source:notebooks or notebook:<slug>.`;
@@ -684,6 +684,28 @@ function validateSourceFilter(filters) {
   }
   return void 0;
 }
+function validateSubscribedFilter(filters) {
+  for (const f of filters) {
+    if (f.key !== "subscribed") continue;
+    for (const v of f.values) {
+      if (v.value !== "true" && v.value !== "false") {
+        return `Invalid subscribed: value '${v.value}' \u2014 expected true or false`;
+      }
+    }
+  }
+  return void 0;
+}
+function validateFeedFilter(filters) {
+  for (const f of filters) {
+    if (f.key !== "feed") continue;
+    for (const v of f.values) {
+      if (!v.value && !v.wildcard) {
+        return `Invalid feed: value \u2014 expected a non-empty feed identifier or wildcard`;
+      }
+    }
+  }
+  return void 0;
+}
 function extractPipes(raw) {
   let pipeIndex = -1;
   let depth = 0;
@@ -755,7 +777,7 @@ function extractFilters(query, text) {
       let value = quoted ? raw.slice(1, -1) : raw;
       const wildcard = quoted ? false : value.endsWith("*");
       if (wildcard) value = value.slice(0, -1);
-      if (!value) continue;
+      if (!value && !wildcard) continue;
       values.push({ value, wildcard });
     }
     if (values.length === 0) continue;
@@ -1000,6 +1022,16 @@ function parseFindQuery(raw, opts) {
     result.error = sourceError;
     return result;
   }
+  const subscribedError = validateSubscribedFilter(result.filters);
+  if (subscribedError) {
+    result.error = subscribedError;
+    return result;
+  }
+  const feedError = validateFeedFilter(result.filters);
+  if (feedError) {
+    result.error = feedError;
+    return result;
+  }
   const findGrainError = retiredGrainRollup(result.filters);
   if (findGrainError) {
     result.error = findGrainError;
@@ -2975,6 +3007,29 @@ function notebookOriginOfItem(item) {
   if (notebook === "notebook/journal" || notebook === "notebook/playground") return "default";
   return "feed";
 }
+function feedIdOfItem(item) {
+  const origin = notebookOriginOfItem(item);
+  if (origin === "user") return "local";
+  if (item.feedSourceId) return item.feedSourceId;
+  if (origin === "default") return "local";
+  return "core";
+}
+function chunkIdOfItem(item) {
+  if (item.seedChunkId) return item.seedChunkId;
+  const nb = notebookOfItem(item);
+  if (!nb) return void 0;
+  const slug = nb.replace(/^notebook\//, "");
+  return `notebook.${slug}`;
+}
+function isItemSubscribed(item, isNotebookSubscribedFn) {
+  const origin = item.origin ?? notebookOriginOfItem(item);
+  if (origin === "user" || origin === "default") return true;
+  if (!isNotebookSubscribedFn) return true;
+  const feedId = feedIdOfItem(item);
+  const chunkId = chunkIdOfItem(item);
+  if (!chunkId) return true;
+  return isNotebookSubscribedFn(feedId, chunkId);
+}
 function isJournalRow(item) {
   const sourceId = item.sourceId;
   if (item.type === "playground" || item.id?.startsWith("playground/") || item.noteId?.startsWith("playground/")) return false;
@@ -3387,6 +3442,7 @@ var QueryService = class {
   pageStore;
   relationStore;
   datasetStore;
+  isNotebookSubscribed;
   // Optional storage seam properties for block_efforts and typed tag resolution.
   // Injected by the app adapter (`services/queryService.ts`); tests can supply fakes.
   blockEffortsStore = {
@@ -3411,6 +3467,7 @@ var QueryService = class {
       if (stores.blockEffortsStore) this.blockEffortsStore = stores.blockEffortsStore;
       if (stores.tagsStore) this.tagsStore = stores.tagsStore;
       if (stores.noteTagsStore) this.noteTagsStore = stores.noteTagsStore;
+      if (stores.isNotebookSubscribed) this.isNotebookSubscribed = stores.isNotebookSubscribed;
     } else {
       this.store = storesOrEventStore ?? defaultEventStore;
       this.noteStore = noteStore ?? defaultNoteStore;
@@ -3814,6 +3871,38 @@ var QueryService = class {
       }
     }
     notes = applyNotebookFilter(notes, parsed.filters);
+    const isSubscribedFn = options2.isNotebookSubscribed ?? this.isNotebookSubscribed ?? (() => true);
+    for (const filter of parsed.filters) {
+      if (filter.key === "feed") {
+        const wanted = new Set(filter.values.map((v) => v.value));
+        const hasWildcard = filter.values.some((v) => v.wildcard);
+        notes = notes.filter((n) => {
+          const fid = feedIdOfItem(n);
+          const hit = hasWildcard ? fid !== "local" : wanted.has(fid);
+          return filter.negate ? !hit : hit;
+        });
+      }
+    }
+    const subscribedFilter = parsed.filters.find((f) => f.key === "subscribed");
+    if (subscribedFilter) {
+      const wantedValues = new Set(subscribedFilter.values.map((v) => v.value));
+      const wantsTrue = wantedValues.has("true");
+      const wantsFalse = wantedValues.has("false");
+      notes = notes.filter((n) => {
+        const isSub = isItemSubscribed(n, isSubscribedFn);
+        let match = false;
+        if (wantsTrue && wantsFalse) {
+          match = true;
+        } else if (wantsTrue) {
+          match = isSub;
+        } else if (wantsFalse) {
+          match = !isSub;
+        }
+        return subscribedFilter.negate ? !match : match;
+      });
+    } else if (parsed.target === "notebook" || parsed.raw.startsWith(":notebook")) {
+      notes = notes.filter((n) => isItemSubscribed(n, isSubscribedFn));
+    }
     for (const filter of parsed.filters) {
       if (filter.key === "note") {
         const wanted = new Set(filter.values.map((v) => v.value));
@@ -3952,6 +4041,36 @@ var QueryService = class {
       }
     }
     blocks = applyNotebookFilter(blocks, parsed.filters);
+    const isSubscribedFn = options2.isNotebookSubscribed ?? this.isNotebookSubscribed ?? (() => true);
+    for (const filter of parsed.filters) {
+      if (filter.key === "feed") {
+        const wanted = new Set(filter.values.map((v) => v.value));
+        const hasWildcard = filter.values.some((v) => v.wildcard);
+        blocks = blocks.filter((b) => {
+          const fid = feedIdOfItem(b);
+          const hit = hasWildcard ? fid !== "local" : wanted.has(fid);
+          return filter.negate ? !hit : hit;
+        });
+      }
+    }
+    const subscribedFilter = parsed.filters.find((f) => f.key === "subscribed");
+    if (subscribedFilter) {
+      const wantedValues = new Set(subscribedFilter.values.map((v) => v.value));
+      const wantsTrue = wantedValues.has("true");
+      const wantsFalse = wantedValues.has("false");
+      blocks = blocks.filter((b) => {
+        const isSub = isItemSubscribed(b, isSubscribedFn);
+        let match = false;
+        if (wantsTrue && wantsFalse) {
+          match = true;
+        } else if (wantsTrue) {
+          match = isSub;
+        } else if (wantsFalse) {
+          match = !isSub;
+        }
+        return subscribedFilter.negate ? !match : match;
+      });
+    }
     for (const filter of parsed.filters) {
       if (isTagLabelKey(filter.key) && !filter.negate) {
         const matchingNoteIds = /* @__PURE__ */ new Set();
@@ -5053,7 +5172,39 @@ function parseMetaLines(lines) {
         items.push(itemMatch[1].trim());
         i++;
       }
-      meta[key] = items.length > 0 ? items : "";
+      if (items.length > 0) {
+        meta[key] = items;
+      } else if (key === "metrics" || key === "summaries") {
+        while (i + 1 < lines.length) {
+          const childLine = lines[i + 1];
+          if (/^\s*(?:#.*)?$/.test(childLine)) {
+            i++;
+            continue;
+          }
+          const childMatch = childLine.match(/^\s{2,}([A-Za-z][\w.-]*)\s*:(.*)$/);
+          if (!childMatch) break;
+          i++;
+          const childKey = `${key}.${childMatch[1]}`;
+          const childRaw = childMatch[2].trim();
+          if (childRaw === "") {
+            const childItems = [];
+            while (i + 1 < lines.length) {
+              const listMatch = lines[i + 1].match(/^\s{4,}-\s+(.+)$/);
+              if (!listMatch) break;
+              childItems.push(listMatch[1].trim());
+              i++;
+            }
+            meta[childKey] = childItems.length > 0 ? childItems : "";
+          } else {
+            const wasQuoted = /^(['"])(.*)\1$/.test(childRaw);
+            const value = unquote(childRaw);
+            const num = Number(value);
+            meta[childKey] = !wasQuoted && value !== "" && !isNaN(num) ? num : value;
+          }
+        }
+      } else {
+        meta[key] = "";
+      }
     } else {
       const wasQuoted = /^(['"])(.*)\1$/.test(rawVal);
       const value = unquote(rawVal);
@@ -5478,13 +5629,13 @@ ${query}
 }
 
 // src/version.ts
-var VERSION = "0.45.2166";
-var GIT_SHA = "32bda10";
-var BUILD_TIME = "2026-10-26T20:01:09.868Z";
+var VERSION = "0.46.2168";
+var GIT_SHA = "109e0ec";
+var BUILD_TIME = "2026-10-26T22:17:26.224Z";
 var SEMVER = {
-  version: "0.45.2166",
-  gitSha: "32bda10",
-  buildTime: "2026-10-26T20:01:09.868Z"
+  version: "0.46.2168",
+  gitSha: "109e0ec",
+  buildTime: "2026-10-26T22:17:26.224Z"
 };
 
 Object.defineProperty(exports, "DEFAULT_NOTEBOOK_SLUGS", {
@@ -5579,6 +5730,7 @@ exports.buildDashboardDocument = buildDashboardDocument;
 exports.buildDashboardScaffold = buildDashboardScaffold;
 exports.buildDrillDownQuery = buildDrillDownQuery;
 exports.captureContext = captureContext;
+exports.chunkIdOfItem = chunkIdOfItem;
 exports.civilDateAdd = civilDateAdd;
 exports.civilDateDiff = civilDateDiff;
 exports.civilDateOf = civilDateOf;
@@ -5594,6 +5746,7 @@ exports.duplicateWidget = duplicateWidget;
 exports.eventsToStoredLogs = eventsToStoredLogs;
 exports.extractDashboardTokens = extractDashboardTokens;
 exports.extractFrontmatterTags = extractFrontmatterTags;
+exports.feedIdOfItem = feedIdOfItem;
 exports.feedOfItem = feedOfItem;
 exports.findTargetAdvisories = findTargetAdvisories;
 exports.getList = getList;
@@ -5606,6 +5759,7 @@ exports.isDashboardMeta = isDashboardMeta;
 exports.isDashboardWidgetType = isDashboardWidgetType;
 exports.isEffortDiscipline = isEffortDiscipline;
 exports.isFindQuery = isFindQuery;
+exports.isItemSubscribed = isItemSubscribed;
 exports.isPipelineQuery = isPipelineQuery;
 exports.isProposedMetric = isProposedMetric;
 exports.migrateLegacyChunkId = migrateLegacyChunkId;