@bitcobblers/wod-wiki-wql 0.38.2141 → 0.39.2143

package/dist/index.cjs

@@ -63,12 +63,15 @@ var WQL_FIND_TARGETS = ["note", "block", "effort", "session", "segment", "event"
 var WQL_SOURCE_VALUES = ["journal", "feeds", "guides", "playground", "dashboards", "efforts", "equipment"];
 var WQL_SOURCE_HEADS = [
   "note",
+  "notes",
   "block",
   "effort",
   "session",
   "segment",
   "event",
   "journal",
+  "notebook",
+  "notebooks",
   "feed",
   "feeds",
   "catalog",
@@ -78,6 +81,8 @@ var WQL_SOURCE_HEADS = [
 ];
 var WQL_SOURCE_HEAD_SCOPES = {
   journal: "journal",
+  notebook: "feeds",
+  notebooks: "feeds",
   feed: "feeds",
   feeds: "feeds",
   catalog: "feeds",
@@ -92,7 +97,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", "has", "source", "catalog", ...WQL_TAG_KEYS];
+var WQL_CONTENT_FILTER_KEYS = ["type", "text", "has", "source", "catalog", "notebook", ...WQL_TAG_KEYS];
 var WQL_SOURCES = ["note", "block", "effort", "session", "segment", "event"];
 var WQL_ROLLUP_PERIODS = ["2w", "4w"];
 var WQL_DISPLAY_UNITS = ["kg", "lb"];
@@ -114,7 +119,7 @@ var WQL_KEYWORDS = [
 ];
 
 // src/capabilities.ts
-var CONTENT_GROUPING_DIMENSIONS = ["date", "day", "week", "month", "year", "discipline", "origin", "source", "kind", "type", "tag"];
+var CONTENT_GROUPING_DIMENSIONS = ["date", "day", "week", "month", "year", "discipline", "origin", "source", "notebook", "kind", "type", "tag"];
 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");
@@ -657,7 +662,7 @@ function validateSourceFilter(filters) {
       if (val === "collection" || val === "collections") {
         return `source:${val} is retired \u2014 collections were renamed to feeds; use source:feeds or :feed{}.`;
       }
-      if (WQL_SOURCE_VALUES.includes(val) || val === "feed" || val.startsWith("collection:") || val.startsWith("feed:")) {
+      if (WQL_SOURCE_VALUES.includes(val) || val === "feed" || val === "notebook" || val === "notebooks" || val.startsWith("collection:") || val.startsWith("feed:") || val.startsWith("notebook:") || val.startsWith("notebook/")) {
         continue;
       }
       return `Unknown source "${val}". Try: ${WQL_SOURCE_VALUES.join(", ")} (or collection:<id>, feed:<id>)`;
@@ -943,7 +948,7 @@ function parseFindQuery(raw, opts) {
   if (scope || typeScope) {
     result.target = "note";
   } else {
-    result.target = headName;
+    result.target = headName === "notes" ? "note" : headName;
     if (result.target === "page") {
       result.error = "find:page is retired \u2014 page-ness is handled by type: (e.g. :note{source:guides} or type:feed).";
       return result;
@@ -967,7 +972,7 @@ function parseFindQuery(raw, opts) {
       negate: false,
       values: [{ value: scope, wildcard: false }]
     });
-    if (headName === "catalog" || headName === "catalogs") {
+    if (headName === "catalog" || headName === "catalogs" || headName === "notebook" || headName === "notebooks") {
       result.filters.push({
         key: "type",
         negate: false,
@@ -1503,7 +1508,7 @@ function headApply(o, colonTyped) {
   return { ...o, apply: `${colonTyped ? "" : ":"}${o.label}{` };
 }
 var LEGACY_HEAD_OPTIONS = WQL_AGGREGATORS.map((label) => ({ label, type: "keyword" }));
-var NOTE_COLUMNS = ["title", "date", "createdAt", "type", "sourceId", "catalog"];
+var NOTE_COLUMNS = ["title", "date", "createdAt", "type", "sourceId", "catalog", "notebookId"];
 var BLOCK_COLUMNS = ["noteTitle", "dataType", "position", "createdAt", "noteId", "sourceId"];
 var EFFORT_COLUMNS = ["slug", "label", "registrySource"];
 var SESSION_COLUMNS = ["duration", "startTime", "origin"];
@@ -1530,14 +1535,18 @@ function resolveColonHead(name) {
   const n = name.toLowerCase();
   if (WQL_FUNCTION_HEADS.includes(n)) return { family: "aggregate" };
   if (WQL_CHART_HEADS.includes(n)) return { family: "find" };
-  let source = n;
-  if (!WQL_SOURCE_HEADS.includes(source)) {
-    const partial = source ? WQL_SOURCE_HEADS.filter((t2) => t2.startsWith(source)) : [];
-    if (partial.length === 1) source = partial[0];
+  const headTarget = (head) => {
+    if (head === "notes") return "note";
+    const scoped = WQL_SOURCE_HEAD_SCOPES[head] || WQL_TYPE_HEADS[head];
+    return scoped ? "note" : head;
+  };
+  if (WQL_SOURCE_HEADS.includes(n)) {
+    return { family: "find", target: headTarget(n) };
   }
-  if (WQL_SOURCE_HEADS.includes(source)) {
-    const scoped = WQL_SOURCE_HEAD_SCOPES[source] || WQL_TYPE_HEADS[source];
-    return { family: "find", target: scoped ? "note" : source };
+  const partial = n ? WQL_SOURCE_HEADS.filter((t2) => t2.startsWith(n)) : [];
+  const targets = [...new Set(partial.map(headTarget))];
+  if (targets.length === 1) {
+    return { family: "find", target: targets[0] };
   }
   return { family: "find" };
 }
@@ -2941,7 +2950,7 @@ function sourceMatches(item, kind) {
     if (sourceId && sourceId !== "journal" && !NOTE_UUID_RE.test(sourceId) && !/^journal\/\d{4}-\d{2}-\d{2}$/.test(sourceId)) return false;
     return item.type !== "dashboard" && item.type !== "effort" && item.type !== "equipment" && item.seedOrigin !== "seed" && item.seedChunkId === void 0 && !item.catalog && !(!!item.sourcePath && item.sourcePath.startsWith("markdown/"));
   }
-  if (kind === "feed" || kind === "feeds") {
+  if (kind === "feed" || kind === "feeds" || kind === "notebook" || kind === "notebooks") {
     return !!sourceId && (sourceId.startsWith("collection:") || sourceId.startsWith("page:collection:"));
   }
   if (kind === "page" || kind === "pages") {
@@ -2959,6 +2968,9 @@ function sourceMatches(item, kind) {
     const idRest = sourceId.slice("feed:".length).replace(/^feeds\//, "");
     return idRest === rest || idRest.startsWith(`${rest}/`);
   }
+  if (kind.startsWith("notebook:") || kind.startsWith("notebook/")) {
+    return notebookOfItem(item) === wodWikiCore.toNotebookId(kind);
+  }
   return sourceId === kind;
 }
 function applySourceFilter(items, filters) {
@@ -3675,7 +3687,7 @@ var QueryService = class {
     if (parsed.target === "segment" || parsed.target === "event") {
       return this.runFindTable(parsed, options2);
     }
-    const isCatalogHead = parsed.target === "note" && parsed.filters.some((f) => f.key === "type" && !f.negate && f.values.some((v) => v.value === "feed")) && (parsed.filters.some((f) => f.key === "source" && !f.negate && f.values.some((v) => v.value === "feed" || v.value === "feeds")) || parsed.sourceScope?.includes("feeds"));
+    const isCatalogHead = parsed.target === "note" && parsed.filters.some((f) => f.key === "type" && !f.negate && f.values.some((v) => v.value === "feed")) && (parsed.filters.some((f) => f.key === "source" && !f.negate && f.values.some((v) => v.value === "feed" || v.value === "feeds" || v.value === "notebook" || v.value === "notebooks")) || parsed.sourceScope?.includes("feeds") || parsed.sourceScope?.includes("notebooks"));
     if (isCatalogHead) {
       return this.runFindCatalog(parsed, options2, await this.noteStore.getAllNotes());
     }
@@ -4524,14 +4536,14 @@ var QueryService = class {
       }
     }
     const criteriaFilters = parsed.filters.filter(
-      (f) => !(f.key === "source" && !f.negate && f.values.some((v) => v.value === "feeds" || v.value === "feed")) && !(f.key === "type" && !f.negate && f.values.some((v) => v.value === "feed"))
+      (f) => !(f.key === "source" && !f.negate && f.values.some((v) => v.value === "feeds" || v.value === "feed" || v.value === "notebooks" || v.value === "notebook")) && !(f.key === "type" && !f.negate && f.values.some((v) => v.value === "feed"))
     );
     let matchingCatalogs = [...catalogNotes];
     for (const filter of criteriaFilters) {
-      if (filter.key === "catalog") {
-        const wanted = new Set(filter.values.map((v) => v.value));
+      if (filter.key === "catalog" || filter.key === "notebook") {
+        const wanted = new Set(filter.values.map((v) => wodWikiCore.notebookSlugFromId(v.value)));
         matchingCatalogs = matchingCatalogs.filter((c) => {
-          const catId = catalogOfItem(c) ?? c.id;
+          const catId = wodWikiCore.notebookSlugFromId(catalogOfItem(c) ?? c.id);
           const hit = wanted.has(catId);
           return filter.negate ? !hit : hit;
         });
@@ -5257,13 +5269,13 @@ ${query}
 }
 
 // src/version.ts
-var VERSION = "0.38.2141";
-var GIT_SHA = "b9b40a7";
-var BUILD_TIME = "2026-10-19T12:09:48.802Z";
+var VERSION = "0.39.2143";
+var GIT_SHA = "6749fcd";
+var BUILD_TIME = "2026-10-19T23:48:27.952Z";
 var SEMVER = {
-  version: "0.38.2141",
-  gitSha: "b9b40a7",
-  buildTime: "2026-10-19T12:09:48.802Z"
+  version: "0.39.2143",
+  gitSha: "6749fcd",
+  buildTime: "2026-10-19T23:48:27.952Z"
 };
 
 Object.defineProperty(exports, "DEFAULT_NOTEBOOK_SLUGS", {