@arbidocs/blocks 0.4.122 → 0.4.124

package/node_modules/@arbidocs/coedit/dist/commands.cjs

@@ -1171,19 +1171,28 @@ function definitionOfAnchor(anchor, definitions) {
 // src/commands/everywhere.ts
 var WORD = "[\\p{L}\\p{N}_\\-\u2010\u2011]";
 var escape = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+var ARTICLE = /^(the|a|an|this|that|such|said)\s+/i;
+var withoutArticle = (words) => words.replace(/\s+/g, " ").trim().replace(ARTICLE, "");
+var anyCase = (word) => `[${word[0].toUpperCase()}${word[0].toLowerCase()}]${escape(word.slice(1))}`;
 function needlesOf(spec) {
-  const term = spec.term.replace(/\s+/g, " ").trim();
-  const variants = [
-    ...new Set((spec.variants ?? []).map((v) => v.replace(/\s+/g, " ").trim()))
-  ].filter((v) => v && v !== term);
-  const needles = [
-    ...variants.map((text) => ({ text, kind: "variant" })),
-    ...spec.link ? [{ text: term, kind: "term" }] : []
-  ];
+  const term = withoutArticle(spec.term);
+  const seen = /* @__PURE__ */ new Set();
+  const needles = [];
+  for (const raw of spec.variants ?? []) {
+    const words = raw.replace(/\s+/g, " ").trim();
+    const article = ARTICLE.exec(words)?.[1] ?? "";
+    const text = words.slice(article ? ARTICLE.exec(words)[0].length : 0);
+    const key = `${article.toLowerCase()} ${text}`;
+    if (!text || text === term || seen.has(key)) continue;
+    seen.add(key);
+    needles.push({ text, article, kind: "variant" });
+  }
+  if (spec.link) needles.push({ text: term, article: "", kind: "term" });
   return needles.map((n) => ({
-    ...n,
+    text: n.text,
+    kind: n.kind,
     pattern: new RegExp(
-      `(?<!${WORD})${n.text.split(" ").map(escape).join("\\s+")}(?!${WORD})`,
+      `(?<!${WORD})(${n.article ? `${anyCase(n.article)}\\s+` : ""})(${n.text.split(" ").map(escape).join("\\s+")})(?!${WORD})`,
       "gu"
     )
   }));
@@ -1192,7 +1201,7 @@ function matchesIn(text, needles) {
   const found = [];
   for (const needle of needles)
     for (const m of text.matchAll(needle.pattern))
-      found.push({ offset: m.index ?? 0, text: m[0], kind: needle.kind });
+      found.push({ offset: (m.index ?? 0) + m[1].length, text: m[2], kind: needle.kind });
   found.sort((a, b) => a.offset - b.offset || b.text.length - a.text.length);
   const out = [];
   for (const m of found)
@@ -1203,7 +1212,9 @@ function matchesIn(text, needles) {
 var overlaps = (start, end, from, to) => start < to && from < end;
 function findTermUses(paragraphs, spec, bookmark) {
   const needles = needlesOf(spec);
-  const defining = new Set([spec.term, ...spec.variants ?? []].map(termKey));
+  const defining = new Set(
+    [spec.term, ...spec.variants ?? []].map((w) => termKey(withoutArticle(w)))
+  );
   const uses = [];
   const skipped = [];
   for (const p of paragraphs) {
@@ -1242,7 +1253,7 @@ var TermEverywhereError = class extends Error {
   }
 };
 function applyTermEverywhere(port, spec, { accept } = {}) {
-  const term = spec.term.replace(/\s+/g, " ").trim();
+  const term = withoutArticle(spec.term);
   if (!term) throw new Error("Name the defined term.");
   let addedDefinition = false;
   let link;
@@ -1419,5 +1430,6 @@ exports.tableState = tableState;
 exports.termKey = termKey;
 exports.termLinkXml = termLinkXml;
 exports.undoOps = undoOps;
+exports.withoutArticle = withoutArticle;
 //# sourceMappingURL=commands.cjs.map
 //# sourceMappingURL=commands.cjs.map