@bitcobblers/wod-wiki-wql 0.37.2140 → 0.39.2142

package/dist/index.cjs

@@ -31,7 +31,7 @@ var WQL_TAG_KEYS = [
   "result",
   "tags"
 ];
-var WQL_CONTENT_ONLY_KEYS = ["type", "text", "has", "source", "catalog"];
+var WQL_CONTENT_ONLY_KEYS = ["type", "text", "has", "source", "catalog", "notebook"];
 var WQL_EFFORT_FILTER_KEYS = ["effort", "discipline", "intensity", "origin", "text"];
 var WQL_VIRTUAL_DIMS = ["day", "week", "session", "round"];
 var WQL_CALC_TARGETS = [
@@ -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");
@@ -129,8 +134,8 @@ var AGGREGATE_TYPES = /* @__PURE__ */ new Set([
   "metric"
 ]);
 var TARGET_TYPES = {
-  note: /* @__PURE__ */ new Set(["text", "catalog", "tag", "effort", ...WQL_TYPED_TAG_KEYS, "type", "page", "source", "note", "time", "groupby", "where"]),
-  block: /* @__PURE__ */ new Set(["text", "catalog", "tag", "effort", "type", "source", "note", "time", "groupby", "where"]),
+  note: /* @__PURE__ */ new Set(["text", "catalog", "notebook", "tag", "effort", ...WQL_TYPED_TAG_KEYS, "type", "page", "source", "note", "time", "groupby", "where"]),
+  block: /* @__PURE__ */ new Set(["text", "catalog", "notebook", "tag", "effort", "type", "source", "note", "time", "groupby", "where"]),
   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"]),
@@ -598,9 +603,12 @@ function parseQuery(raw) {
   }
   return parseSingleQuery(raw);
 }
+function normalizeNotebookFilterText(raw) {
+  return raw.replace(/\bnotebook:notebook\/([a-zA-Z0-9_-]+)/g, 'notebook:"notebook/$1"');
+}
 function normalizeWql(raw) {
   const advisories = [];
-  let text = raw.trim();
+  let text = normalizeNotebookFilterText(raw.trim());
   const { primary, where } = splitAtWhere(text);
   const isFind = primary.startsWith("find:");
   if (isFind) {
@@ -654,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>)`;
@@ -870,7 +878,8 @@ function cannotParseFind(text) {
   return `Cannot parse "${text}". Expected :source{key:value, !key:value}; filters are optional. Optional suffixes include by {dimension}, last <n>d or last <n>w, from YYYY-MM-DD [to YYYY-MM-DD], where <aggregator>:<metric>{filters} <operator> <number>, and | order by <column> | limit <n>. Support depends on the target.`;
 }
 function parseFindQuery(raw, opts) {
-  const { text: rawNoPipes, pipes } = extractPipes(raw);
+  const normalizedRaw = normalizeNotebookFilterText(raw);
+  const { text: rawNoPipes, pipes } = extractPipes(normalizedRaw);
   const suffixes = parseWqlSuffixes(rawNoPipes);
   const { where: whereText, window: windowSuffix, legacyScope, groupBy, displayUnit, primaryText: text } = suffixes;
   const win = toQueryWindow(windowSuffix);
@@ -939,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;
@@ -963,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,
@@ -1499,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"];
@@ -1526,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" };
 }
@@ -2899,8 +2912,6 @@ function dedupeById(facts) {
   }
   return out;
 }
-
-// src/QueryService.ts
 var NOTE_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function catalogOfItem(item) {
   if (item.catalog) return item.catalog;
@@ -2912,6 +2923,25 @@ function catalogOfItem(item) {
   if (!isCollectionOrFeed && !clean.includes("/")) return void 0;
   return clean.split("/")[0];
 }
+function notebookOfItem(item) {
+  if (item.notebookId && item.notebookId.trim()) {
+    return wodWikiCore.toNotebookId(item.notebookId);
+  }
+  if (item.tags) {
+    for (const tag of item.tags) {
+      if (tag.startsWith("notebook:") || tag.startsWith("notebook/")) {
+        const slug = wodWikiCore.notebookSlugFromId(tag);
+        if (slug) return wodWikiCore.toNotebookId(slug);
+      }
+    }
+  }
+  if (sourceMatches(item, "playground")) return "notebook/playground";
+  if (sourceMatches(item, "guides")) return "notebook/guides";
+  const cat = catalogOfItem(item);
+  if (cat) return wodWikiCore.toNotebookId(cat);
+  if (sourceMatches(item, "journal")) return "notebook/journal";
+  return void 0;
+}
 function sourceMatches(item, kind) {
   const sourceId = item.sourceId;
   if (kind === "all") return !sourceId || WQL_SOURCE_VALUES.some((k) => sourceMatches(item, k));
@@ -2920,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") {
@@ -2938,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) {
@@ -2951,6 +2984,19 @@ function applySourceFilter(items, filters) {
   }
   return items;
 }
+function applyNotebookFilter(items, filters) {
+  for (const filter of filters) {
+    if (filter.key !== "notebook") continue;
+    const wanted = new Set(filter.values.map((v) => wodWikiCore.toNotebookId(v.value)));
+    items = items.filter((item) => {
+      const nb = notebookOfItem(item);
+      if (!nb) return filter.negate;
+      const hit = wanted.has(nb);
+      return filter.negate ? !hit : hit;
+    });
+  }
+  return items;
+}
 var DOMAIN_SOURCE_KINDS = {
   feed: true,
   feeds: true,
@@ -3641,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());
     }
@@ -3724,6 +3770,7 @@ var QueryService = class {
         });
       }
     }
+    notes = applyNotebookFilter(notes, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "note") {
         const wanted = new Set(filter.values.map((v) => v.value));
@@ -3862,6 +3909,7 @@ var QueryService = class {
         });
       }
     }
+    blocks = applyNotebookFilter(blocks, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "tags" && !filter.negate) {
         const matchingNoteIds = /* @__PURE__ */ new Set();
@@ -4488,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;
         });
@@ -5221,15 +5269,19 @@ ${query}
 }
 
 // src/version.ts
-var VERSION = "0.37.2140";
-var GIT_SHA = "bcf7960";
-var BUILD_TIME = "2026-10-18T21:43:29.081Z";
+var VERSION = "0.39.2142";
+var GIT_SHA = "fce2c7d";
+var BUILD_TIME = "2026-10-19T23:06:12.684Z";
 var SEMVER = {
-  version: "0.37.2140",
-  gitSha: "bcf7960",
-  buildTime: "2026-10-18T21:43:29.081Z"
+  version: "0.39.2142",
+  gitSha: "fce2c7d",
+  buildTime: "2026-10-19T23:06:12.684Z"
 };
 
+Object.defineProperty(exports, "DEFAULT_NOTEBOOK_SLUGS", {
+  enumerable: true,
+  get: function () { return wodWikiCore.DEFAULT_NOTEBOOK_SLUGS; }
+});
 Object.defineProperty(exports, "SYSTEM_DEFAULT_OUTPUT_UNIT", {
   enumerable: true,
   get: function () { return wodWikiCore.SYSTEM_DEFAULT_OUTPUT_UNIT; }
@@ -5246,14 +5298,26 @@ Object.defineProperty(exports, "dimensionKeyOf", {
   enumerable: true,
   get: function () { return wodWikiCore.dimensionKeyOf; }
 });
+Object.defineProperty(exports, "isNoteEditable", {
+  enumerable: true,
+  get: function () { return wodWikiCore.isNoteEditable; }
+});
 Object.defineProperty(exports, "lookupUnit", {
   enumerable: true,
   get: function () { return wodWikiCore.lookupUnit; }
 });
+Object.defineProperty(exports, "notebookSlugFromId", {
+  enumerable: true,
+  get: function () { return wodWikiCore.notebookSlugFromId; }
+});
 Object.defineProperty(exports, "systemDefaultUnit", {
   enumerable: true,
   get: function () { return wodWikiCore.systemDefaultUnit; }
 });
+Object.defineProperty(exports, "toNotebookId", {
+  enumerable: true,
+  get: function () { return wodWikiCore.toNotebookId; }
+});
 exports.BUILD_TIME = BUILD_TIME;
 exports.CONTENT_GROUPING_DIMENSIONS = CONTENT_GROUPING_DIMENSIONS;
 exports.DASHBOARD_GRID_MAX_COLS = DASHBOARD_GRID_MAX_COLS;
@@ -5336,6 +5400,7 @@ exports.migrateLegacyDashboardBodies = migrateLegacyDashboardBodies;
 exports.moveWidget = moveWidget;
 exports.normalizeSummaryFacts = normalizeSummaryFacts;
 exports.normalizeWql = normalizeWql;
+exports.notebookOfItem = notebookOfItem;
 exports.parseDashboardNote = parseDashboardNote;
 exports.parseDocument = parseDocument;
 exports.parseFlatProperties = parseFlatProperties;