Update logic to find repeated words (#1095)

paranext · Aug 28, 2024 · b10502e · b10502e
2 parents f414e0a + 8c5760e
commit b10502e
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 256 deletions.
diff --git a/extensions/src/platform-scripture/src/inventory-utils.ts b/extensions/src/platform-scripture/src/inventory-utils.ts
@@ -29,11 +29,10 @@ export const extractRepeatedWords = (
   text: string,
   target: string | undefined = undefined,
 ): string[] => {
-  const repeatedWords: string[] = [];
-  const words = split(text, /[\s]+/);
-  words.forEach((word, index, allWords) => {
-    if (target && word !== target) return;
-    if (index + 1 < allWords.length && word === allWords[index + 1]) repeatedWords.push(word);
-  });
+  // Finds repeated words, and captures the first occurrence of the word
+  const repeatedWords = text.match(/\b(\p{L}+)\b(?= \b\1\b)/gu) || [];
+
+  if (target) return repeatedWords?.filter((word) => word === target);
+
   return repeatedWords;
 };
diff --git a/lib/platform-bible-react/dist/index.cjs b/lib/platform-bible-react/dist/index.cjs
diff --git a/lib/platform-bible-react/dist/index.cjs.map b/lib/platform-bible-react/dist/index.cjs.map
diff --git a/lib/platform-bible-react/dist/index.js b/lib/platform-bible-react/dist/index.js
diff --git a/lib/platform-bible-react/dist/index.js.map b/lib/platform-bible-react/dist/index.js.map
diff --git a/...latform-bible-react/src/preview/pages/components/advanced/inventory-example.component.tsx b/...latform-bible-react/src/preview/pages/components/advanced/inventory-example.component.tsx
@@ -9,7 +9,7 @@ import Inventory, {
   Scope,
   Status,
 } from '@/components/advanced/inventory/inventory.component';
-import { ScriptureReference } from 'platform-bible-utils';
+import { ScriptureReference, split } from 'platform-bible-utils';
 import { useState } from 'react';
 import scriptureSnippet from './scripture-snippet';
 
@@ -41,13 +41,9 @@ const createColumns = (
 ];
 
 const extractItems = (text: string, target: string | undefined = undefined): string[] => {
-  const repeatedWords: string[] = [];
-  const words = text.split(/[\s]+/);
-  words.forEach((word, index, allWords) => {
-    if (target && word !== target) return;
-    if (index + 1 < allWords.length && word === allWords[index + 1]) repeatedWords.push(word);
-  });
-  return repeatedWords;
+  let characters: string[] = split(text, '');
+  if (target) characters = characters.filter((character) => character === target);
+  return characters;
 };
 
 function InventoryExample() {