@bitcobblers/wod-wiki-wql 0.37.2139 → 0.38.2141

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 = [
@@ -129,8 +129,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 +598,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) {
@@ -870,7 +873,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);
@@ -2899,8 +2903,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 +2914,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));
@@ -2951,6 +2972,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,
@@ -3724,6 +3758,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 +3897,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();
@@ -5221,15 +5257,19 @@ ${query}
 }
 
 // src/version.ts
-var VERSION = "0.37.2139";
-var GIT_SHA = "491ec71";
-var BUILD_TIME = "2026-10-17T15:36:01.834Z";
+var VERSION = "0.38.2141";
+var GIT_SHA = "b9b40a7";
+var BUILD_TIME = "2026-10-19T12:09:48.802Z";
 var SEMVER = {
-  version: "0.37.2139",
-  gitSha: "491ec71",
-  buildTime: "2026-10-17T15:36:01.834Z"
+  version: "0.38.2141",
+  gitSha: "b9b40a7",
+  buildTime: "2026-10-19T12:09:48.802Z"
 };
 
+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 +5286,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 +5388,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;