#4607 - Bugfix (monomers.ts): Correct isValidNucleoside(1), `isVali…

…dNucleotide(1)`
epam · Jun 5, 2024 · c656774 · c656774
1 parent 6b0221d
commit c656774
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/packages/ketcher-core/src/domain/helpers/monomers.ts b/packages/ketcher-core/src/domain/helpers/monomers.ts
@@ -86,22 +86,38 @@ export function isMonomerBeginningOfChain(
   );
 }
 
-export function isValidNucleotide(sugar: Sugar) {
+export function isValidNucleotide(sugar: Sugar): boolean {
+  if (!getRnaBaseFromSugar(sugar)) {
+    return false;
+  }
+
   const phosphate = getPhosphateFromSugar(sugar);
+  if (!phosphate) {
+    return false;
+  }
+
   const nextMonomerAfterPhosphate = getNextMonomerInChain(phosphate);
+  if (!(nextMonomerAfterPhosphate instanceof Sugar)) {
+    return false;
+  }
 
-  return Boolean(
-    getRnaBaseFromSugar(sugar) &&
-      getPhosphateFromSugar(sugar) &&
-      nextMonomerAfterPhosphate,
-  );
+  return !!getRnaBaseFromSugar(nextMonomerAfterPhosphate);
 }
 
-export function isValidNucleoside(sugar: Sugar) {
+export function isValidNucleoside(sugar: Sugar): boolean {
+  if (!getRnaBaseFromSugar(sugar)) {
+    return false;
+  }
+
   const phosphate = getPhosphateFromSugar(sugar);
+  if (!phosphate) {
+    return true;
+  }
+
   const nextMonomerAfterPhosphate = getNextMonomerInChain(phosphate);
+  if (!(nextMonomerAfterPhosphate instanceof Sugar)) {
+    return true;
+  }
 
-  return (
-    getRnaBaseFromSugar(sugar) && (!phosphate || !nextMonomerAfterPhosphate)
-  );
+  return !getRnaBaseFromSugar(nextMonomerAfterPhosphate);
 }