@arbidocs/coedit 0.4.122 → 0.4.124

package/dist/commands.d.cts

@@ -438,6 +438,8 @@ interface TermEverywhereResult {
     /** The definition was not in the document and was added to its Definitions section. */
     addedDefinition: boolean;
 }
+/** A term or variant without a leading article ("the Supplier" is the term "Supplier"). */
+declare const withoutArticle: (words: string) => string;
 /**
  * Every use of the term (when linking) and of its variants in `paragraphs`: the ones to change,
  * and the ones left as they are with the reason. `bookmark` is the definition's, which tells an
@@ -495,4 +497,4 @@ declare function documentReader(view: DocumentTrees): DocumentReader;
 /** Read a document from its bytes (a collaboration room's `readRoom`). Throws on a bad package. */
 declare function readDocument(bytes: Uint8Array): DocumentReader;
 
-export { AGENT_UNDO_MAP, type BrokenReference, CHARACTER_STYLES, type CrossReference, type CrossReferenceMode, CrossReferenceTarget, DEFINITIONS_HEADING, DEFINITION_BOOKMARK_PREFIX, type DefinitionText, DefinitionsPort, type DefinitionsSection, DocParagraph, DocPoint, DocumentNumbering, type DocumentReader, type DocumentTrees, type InsertTermResult, LevelOf, ListItemInfo, OoxmlNodeLike, type ParagraphState, type ParsedDefinition, REF_BOOKMARK_PREFIX, ReferencesPort, type ReferencesReader, type RefreshResult, type ReplacedSpan, type SectionState, type StaleReference, type TermChange, TermEverywhereError, type TermEverywhereResult, type TermSkip, type TermSkipReason, type TermSpec, type TermUse, type UndoRecord, W_NAMESPACES, addDefinition, applyTermEverywhere, brokenCrossReferences, compareTerms, crossReferenceXml, crossReferences, definitionBookmark, definitionIdOfBookmark, definitionOfAnchor, definitionParagraphText, definitionParagraphXml, definitionTooltip, definitionsById, documentReader, documentReferenceTooltip, documentStyleIds, documentXml, docxPackage, ensureTargetBookmark, esc, fieldNodeIds, findDefinitionsSection, findTermUses, fragmentPackage, headingParagraphXml, hyperlinkRelationship, insertCrossReference, insertCrossReferenceField, insertDefinedTerm, insertDocumentReference, insertionIndex, isDefinitionsTitle, markCrossReferenceTarget, newRefBookmark, paragraphIndex, paragraphRunsXml, paragraphState, parseDefinition, readDocument, refFieldXml, refInstruction, refResult, refTooltip, refreshCrossReferences, replaceSpan, sectionStates, staleCrossReferences, stylesUsed, stylesXml, tableOf, tableState, termKey, termLinkXml, undoOps };
+export { AGENT_UNDO_MAP, type BrokenReference, CHARACTER_STYLES, type CrossReference, type CrossReferenceMode, CrossReferenceTarget, DEFINITIONS_HEADING, DEFINITION_BOOKMARK_PREFIX, type DefinitionText, DefinitionsPort, type DefinitionsSection, DocParagraph, DocPoint, DocumentNumbering, type DocumentReader, type DocumentTrees, type InsertTermResult, LevelOf, ListItemInfo, OoxmlNodeLike, type ParagraphState, type ParsedDefinition, REF_BOOKMARK_PREFIX, ReferencesPort, type ReferencesReader, type RefreshResult, type ReplacedSpan, type SectionState, type StaleReference, type TermChange, TermEverywhereError, type TermEverywhereResult, type TermSkip, type TermSkipReason, type TermSpec, type TermUse, type UndoRecord, W_NAMESPACES, addDefinition, applyTermEverywhere, brokenCrossReferences, compareTerms, crossReferenceXml, crossReferences, definitionBookmark, definitionIdOfBookmark, definitionOfAnchor, definitionParagraphText, definitionParagraphXml, definitionTooltip, definitionsById, documentReader, documentReferenceTooltip, documentStyleIds, documentXml, docxPackage, ensureTargetBookmark, esc, fieldNodeIds, findDefinitionsSection, findTermUses, fragmentPackage, headingParagraphXml, hyperlinkRelationship, insertCrossReference, insertCrossReferenceField, insertDefinedTerm, insertDocumentReference, insertionIndex, isDefinitionsTitle, markCrossReferenceTarget, newRefBookmark, paragraphIndex, paragraphRunsXml, paragraphState, parseDefinition, readDocument, refFieldXml, refInstruction, refResult, refTooltip, refreshCrossReferences, replaceSpan, sectionStates, staleCrossReferences, stylesUsed, stylesXml, tableOf, tableState, termKey, termLinkXml, undoOps, withoutArticle };

package/dist/commands.d.ts

@@ -438,6 +438,8 @@ interface TermEverywhereResult {
     /** The definition was not in the document and was added to its Definitions section. */
     addedDefinition: boolean;
 }
+/** A term or variant without a leading article ("the Supplier" is the term "Supplier"). */
+declare const withoutArticle: (words: string) => string;
 /**
  * Every use of the term (when linking) and of its variants in `paragraphs`: the ones to change,
  * and the ones left as they are with the reason. `bookmark` is the definition's, which tells an
@@ -495,4 +497,4 @@ declare function documentReader(view: DocumentTrees): DocumentReader;
 /** Read a document from its bytes (a collaboration room's `readRoom`). Throws on a bad package. */
 declare function readDocument(bytes: Uint8Array): DocumentReader;
 
-export { AGENT_UNDO_MAP, type BrokenReference, CHARACTER_STYLES, type CrossReference, type CrossReferenceMode, CrossReferenceTarget, DEFINITIONS_HEADING, DEFINITION_BOOKMARK_PREFIX, type DefinitionText, DefinitionsPort, type DefinitionsSection, DocParagraph, DocPoint, DocumentNumbering, type DocumentReader, type DocumentTrees, type InsertTermResult, LevelOf, ListItemInfo, OoxmlNodeLike, type ParagraphState, type ParsedDefinition, REF_BOOKMARK_PREFIX, ReferencesPort, type ReferencesReader, type RefreshResult, type ReplacedSpan, type SectionState, type StaleReference, type TermChange, TermEverywhereError, type TermEverywhereResult, type TermSkip, type TermSkipReason, type TermSpec, type TermUse, type UndoRecord, W_NAMESPACES, addDefinition, applyTermEverywhere, brokenCrossReferences, compareTerms, crossReferenceXml, crossReferences, definitionBookmark, definitionIdOfBookmark, definitionOfAnchor, definitionParagraphText, definitionParagraphXml, definitionTooltip, definitionsById, documentReader, documentReferenceTooltip, documentStyleIds, documentXml, docxPackage, ensureTargetBookmark, esc, fieldNodeIds, findDefinitionsSection, findTermUses, fragmentPackage, headingParagraphXml, hyperlinkRelationship, insertCrossReference, insertCrossReferenceField, insertDefinedTerm, insertDocumentReference, insertionIndex, isDefinitionsTitle, markCrossReferenceTarget, newRefBookmark, paragraphIndex, paragraphRunsXml, paragraphState, parseDefinition, readDocument, refFieldXml, refInstruction, refResult, refTooltip, refreshCrossReferences, replaceSpan, sectionStates, staleCrossReferences, stylesUsed, stylesXml, tableOf, tableState, termKey, termLinkXml, undoOps };
+export { AGENT_UNDO_MAP, type BrokenReference, CHARACTER_STYLES, type CrossReference, type CrossReferenceMode, CrossReferenceTarget, DEFINITIONS_HEADING, DEFINITION_BOOKMARK_PREFIX, type DefinitionText, DefinitionsPort, type DefinitionsSection, DocParagraph, DocPoint, DocumentNumbering, type DocumentReader, type DocumentTrees, type InsertTermResult, LevelOf, ListItemInfo, OoxmlNodeLike, type ParagraphState, type ParsedDefinition, REF_BOOKMARK_PREFIX, ReferencesPort, type ReferencesReader, type RefreshResult, type ReplacedSpan, type SectionState, type StaleReference, type TermChange, TermEverywhereError, type TermEverywhereResult, type TermSkip, type TermSkipReason, type TermSpec, type TermUse, type UndoRecord, W_NAMESPACES, addDefinition, applyTermEverywhere, brokenCrossReferences, compareTerms, crossReferenceXml, crossReferences, definitionBookmark, definitionIdOfBookmark, definitionOfAnchor, definitionParagraphText, definitionParagraphXml, definitionTooltip, definitionsById, documentReader, documentReferenceTooltip, documentStyleIds, documentXml, docxPackage, ensureTargetBookmark, esc, fieldNodeIds, findDefinitionsSection, findTermUses, fragmentPackage, headingParagraphXml, hyperlinkRelationship, insertCrossReference, insertCrossReferenceField, insertDefinedTerm, insertDocumentReference, insertionIndex, isDefinitionsTitle, markCrossReferenceTarget, newRefBookmark, paragraphIndex, paragraphRunsXml, paragraphState, parseDefinition, readDocument, refFieldXml, refInstruction, refResult, refTooltip, refreshCrossReferences, replaceSpan, sectionStates, staleCrossReferences, stylesUsed, stylesXml, tableOf, tableState, termKey, termLinkXml, undoOps, withoutArticle };

package/dist/commands.js

@@ -1169,19 +1169,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"
     )
   }));
@@ -1190,7 +1199,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)
@@ -1201,7 +1210,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) {
@@ -1240,7 +1251,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;
@@ -1343,6 +1354,6 @@ function readDocument(bytes) {
   return documentReader(opened.view);
 }
 
-export { AGENT_UNDO_MAP, BROKEN_CROSS_REFERENCE_STYLE, CHARACTER_STYLES, CROSS_REFERENCE_STYLE, DEFINED_TERM_STYLE, DEFINITIONS_HEADING, DEFINITION_BOOKMARK_PREFIX, FIELD_ATOM, REF_BOOKMARK_PREFIX, TermEverywhereError, WATCHED_STYLES, W_NAMESPACES, addDefinition, applyTermEverywhere, brokenCrossReferences, compareTerms, crossReferenceXml, crossReferences, definitionBookmark, definitionIdOfBookmark, definitionOfAnchor, definitionParagraphText, definitionParagraphXml, definitionTooltip, definitionsById, documentNumbering, documentReader, documentReferenceTooltip, documentStyleIds, documentXml, docxPackage, engineLength, engineOffset, ensureTargetBookmark, esc, fieldNodeIds, filterTargets, findDefinitionsSection, findTermUses, fragmentPackage, headingParagraphXml, hyperlinkRelationship, insertCrossReference, insertCrossReferenceField, insertDefinedTerm, insertDocumentReference, insertionIndex, isDefinitionsTitle, listTargets, markCrossReferenceTarget, newRefBookmark, paragraphIndex, paragraphNumber, paragraphRunsXml, paragraphState, parseDefinition, readDocument, readParagraphs, refFieldXml, refInstruction, refResult, refTooltip, refreshCrossReferences, replaceSpan, sectionStates, staleCrossReferences, styleNames, stylesUsed, stylesXml, tableOf, tableState, termKey, termLinkXml, undoOps };
+export { AGENT_UNDO_MAP, BROKEN_CROSS_REFERENCE_STYLE, CHARACTER_STYLES, CROSS_REFERENCE_STYLE, DEFINED_TERM_STYLE, DEFINITIONS_HEADING, DEFINITION_BOOKMARK_PREFIX, FIELD_ATOM, REF_BOOKMARK_PREFIX, TermEverywhereError, WATCHED_STYLES, W_NAMESPACES, addDefinition, applyTermEverywhere, brokenCrossReferences, compareTerms, crossReferenceXml, crossReferences, definitionBookmark, definitionIdOfBookmark, definitionOfAnchor, definitionParagraphText, definitionParagraphXml, definitionTooltip, definitionsById, documentNumbering, documentReader, documentReferenceTooltip, documentStyleIds, documentXml, docxPackage, engineLength, engineOffset, ensureTargetBookmark, esc, fieldNodeIds, filterTargets, findDefinitionsSection, findTermUses, fragmentPackage, headingParagraphXml, hyperlinkRelationship, insertCrossReference, insertCrossReferenceField, insertDefinedTerm, insertDocumentReference, insertionIndex, isDefinitionsTitle, listTargets, markCrossReferenceTarget, newRefBookmark, paragraphIndex, paragraphNumber, paragraphRunsXml, paragraphState, parseDefinition, readDocument, readParagraphs, refFieldXml, refInstruction, refResult, refTooltip, refreshCrossReferences, replaceSpan, sectionStates, staleCrossReferences, styleNames, stylesUsed, stylesXml, tableOf, tableState, termKey, termLinkXml, undoOps, withoutArticle };
 //# sourceMappingURL=commands.js.map
 //# sourceMappingURL=commands.js.map