fixes for verse spans

package.json

@@ -1,7 +1,7 @@
 {
   "name": "checking-tool-wrapper",
   "description": "Checking tool wrapper for translationCore App",
-  "version": "6.0.1",
+  "version": "6.0.2-alpha",
   "main": "lib/index.js",
   "scripts": {
     "lint": "eslint ./src",

src/Api.js

@@ -241,8 +241,8 @@ export default class Api extends ToolApi {
     const contextId = {
       reference: {
         bookId,
-        chapter: parseInt(chapter),
-        verse: parseInt(verse),
+        chapter: chapter,
+        verse: verse,
       },
     };
     const groupsDataForVerse = getGroupDataForVerse(groupsData, contextId);

src/helpers/groupDataHelpers.js

@@ -128,15 +128,61 @@ export const findGroupDataItem = (contextId, groupData) => {
   return index;
 };
 
+/**
+ * get verse range from span
+ * @param {string} verseSpan
+ * @return {{high: number, low: number}}
+ */
+export function getVerseSpanRange(verseSpan) {
+  let [low, high] = verseSpan.split('-');
+  low = parseInt(low);
+  high = parseInt(high);
+  return { low, high };
+}
+
+/**
+ * test if verse is valid verse number or verse span string
+ * @param {string|number} verse
+ * @return {boolean}
+ */
+export function isVerseSpan(verse) {
+  const isSpan = (typeof verse === 'string') && verse.includes('-');
+  return isSpan;
+}
+
 /**
  * make sure context IDs are for same verse.  Optimized over isEqual()
- * @param {Object} contextId1
- * @param {Object} contextId2
+ * @param {string|number} verseSpan
+ * @param {number} verse
+ * @return {boolean} returns true if verse within verse span
+ */
+export function isVerseWithinVerseSpan(verseSpan, verse) {
+  const { low, high } = getVerseSpanRange(verseSpan);
+
+  if ((low > 0) && (high > 0)) {
+    return ((verse >= low) && (verse <= high));
+  }
+  return false;
+}
+
+/**
+ * make sure context IDs are for same verse.  Optimized over isEqual()
+ * @param {Object} contextId1 - context we are checking
+ * @param {Object} contextId2 - context that we are trying to match, could have verse span
  * @return {boolean} returns true if context IDs are for same verse
  */
 export function isSameVerse(contextId1, contextId2) {
-  return (contextId1.reference.chapter === contextId2.reference.chapter) &&
+  const match = (contextId1.reference.chapter === contextId2.reference.chapter) &&
     (contextId1.reference.verse === contextId2.reference.verse);
+
+  if (!match) { // if not exact match, check for verseSpan
+    if ((contextId1.reference.chapter === contextId2.reference.chapter)) {
+      if (isVerseSpan(contextId2.reference.verse)) {
+        return isVerseWithinVerseSpan(contextId2.reference.verse, contextId1.reference.verse);
+      }
+    }
+  }
+  return match;
 }
 
 /**

src/index.js

@@ -2,3 +2,4 @@ export { default as Api } from './Api';
 export { default as Container } from './Container';
 export { default as reducers } from './state/reducers';
 export { getQuoteAsString } from './helpers/checkAreaHelpers';
+export { getAlignedTextFromBible } from './helpers/gatewayLanguageHelpers';