Refactor getReadingFromDefinition function to normalize text and use …

…matchAll for bracket matching

src/readingParse.js

@@ -6,28 +6,31 @@ const leewayAfterTerm = 2;
  * @returns {string}
  */
 function getReadingFromDefinition(definition, term) {
+  const normalizeText = (text) => text.replace(/ /g, '').toLowerCase();
   // Remove spaces from definition and term
-  definition = definition.replace(/ /g, '');
-  term = term.replace(/ /g, '');
-  const bracketRegex = /([(（]([^)）]*))/g;
-  const bracketMatches = bracketRegex.exec(definition);
+  definition = normalizeText(definition);
+  term = normalizeText(term);
+  const bracketRegex = /([(（]([^)）]*)[)）])/g;
+  const bracketMatches = definition.matchAll(bracketRegex) ?? [];
 
-  if (bracketMatches && bracketMatches.length >= 2) {
-    // @ts-ignore
-    const outerBracketContent = bracketMatches[1];
-    const bracketContent = bracketMatches[2];
-    const bracketIndex = definition.indexOf(outerBracketContent);
-    const termIndex = definition.indexOf(term) ?? 0;
-    const termEndIndex = termIndex + term.length;
-    // If the bracket is not at the beginning of the definition or closely following the term, ignore it
-    if (bracketIndex - termEndIndex > leewayAfterTerm) {
-      return '';
+  for (const matchArr of bracketMatches) {
+    if (matchArr && matchArr.length >= 3) {
+      // @ts-ignore
+      const outerBracketContent = matchArr[1];
+      const bracketContent = matchArr[2];
+      const bracketIndex = definition.indexOf(outerBracketContent);
+      const termIndex = definition.indexOf(term) ?? 0;
+      const termEndIndex = termIndex + term.length;
+      // If the bracket is not at the beginning of the definition or closely following the term, ignore it
+      if (bracketIndex - termEndIndex > leewayAfterTerm) {
+        continue;
+      }
+      // If the bracket is within the term or before the term, ignore it
+      if (bracketIndex < termEndIndex) {
+        continue;
+      }
+      return parseReadingFromBrackets(bracketContent, term);
     }
-    // If the bracket is within the term or before the term, ignore it
-    if (bracketIndex < termIndex) {
-      return '';
-    }
-    return parseReadingFromBrackets(bracketContent, term);
   }
   return '';
 }