Feature foxprogs ranges

.github/workflows/nodejs.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        node-version: [10.15.1]
+        node-version: [16.14.0]
     steps:
       - name: Extract Branch Name
         run: echo "::set-env name=BRANCH::${GITHUB_REF##*/}"

.node-version

@@ -0,0 +1 @@
+16.18.1

__tests__/fixtures/highlighting/3jn/1-10-2.js

@@ -1,8 +1,33 @@
 module.exports = {
-  book: "3jn",
+  book: '3jn',
   chapter: 1,
   verse: 10,
-  quote: "καὶ",
+  quote: 'καὶ & μὴ',
   occurrence: -1,
-  expected: [{ "text": "ἐκ", "occurrence": 1, "occurrences": 1 }, { "text": "τῆς", "occurrence": 1, "occurrences": 1 }, { "text": "ἐκκλησίας", "occurrence": 1, "occurrences": 1 }, { "text": "ἐκβάλλει", "occurrence": 1, "occurrences": 1 }]
-}
+  expected: [
+    {
+      text: 'ἐκ',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+    {
+      text: 'τῆς',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+    {
+      text: 'ἐκκλησίας',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+    {
+      text: 'ἐκβάλλει',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/3jn/1-10.js

@@ -1,8 +1,33 @@
 module.exports = {
-    book:"3jn",
-    chapter:1,
-    verse:10,
-    quote:"ἐκ τῆς ἐκκλησίας ἐκβάλλει",
-    occurrence:1,
-    expected: [{"text":"ἐκ","occurrence":1,"occurrences":1},{"text":"τῆς","occurrence":1,"occurrences":1},{"text":"ἐκκλησίας","occurrence":1,"occurrences":1},{"text":"ἐκβάλλει","occurrence":1,"occurrences":1}]
-  }
+  book: '3jn',
+  chapter: 1,
+  verse: 10,
+  quote: 'ἐκ τῆς ἐκκλησίας ἐκβάλλει',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'ἐκ',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+    {
+      text: 'τῆς',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+    {
+      text: 'ἐκκλησίας',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+    {
+      text: 'ἐκβάλλει',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 10 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/3jn/1-11-2.js

@@ -1,8 +1,27 @@
 module.exports = {
-    book:"3jn",
-    chapter:1,
-    verse:11,
-    quote:"ἀλλὰ τὸ ἀγαθόν",
-    occurrence:1,
-    expected: [{"text":"ἀλλὰ","occurrence":1,"occurrences":1},{"text":"τὸ","occurrence":2,"occurrences":2},{"text":"ἀγαθόν","occurrence":1,"occurrences":1}]
-  }
+  book: '3jn',
+  chapter: 1,
+  verse: 11,
+  quote: 'ἀλλὰ τὸ ἀγαθόν',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'ἀλλὰ',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 11 },
+    },
+    {
+      text: 'τὸ',
+      occurrence: 2,
+      occurrences: 2,
+      reference: { chapter: 1, verse: 11 },
+    },
+    {
+      text: 'ἀγαθόν',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 11 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/3jn/1-11.js

@@ -1,8 +1,33 @@
 module.exports = {
-    book:"3jn",
-    chapter:1,
-    verse:11,
-    quote:"μὴ μιμοῦ τὸ κακὸν,",
-    occurrence:1,
-    expected: [{"text":"μὴ","occurrence":1,"occurrences":1},{"text":"μιμοῦ","occurrence":1,"occurrences":1},{"text":"τὸ","occurrence":1,"occurrences":2},{"text":"κακὸν","occurrence":1,"occurrences":1}]
-  }
+  book: '3jn',
+  chapter: 1,
+  verse: 11,
+  quote: 'μὴ μιμοῦ τὸ κακὸν,',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'μὴ',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 11 },
+    },
+    {
+      text: 'μιμοῦ',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 11 },
+    },
+    {
+      text: 'τὸ',
+      occurrence: 1,
+      occurrences: 2,
+      reference: { chapter: 1, verse: 11 },
+    },
+    {
+      text: 'κακὸν',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 11 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/3jn/1-12.js

@@ -1,8 +1,33 @@
 module.exports = {
-    book:"3jn",
-    chapter:1,
-    verse:12,
-    quote:"ὑπὸ αὐτῆς τῆς ἀληθείας",
-    occurrence:1,
-    expected: [{"text":"ὑπὸ","occurrence":2,"occurrences":2},{"text":"αὐτῆς","occurrence":1,"occurrences":1},{"text":"τῆς","occurrence":1,"occurrences":1},{"text":"ἀληθείας","occurrence":1,"occurrences":1}]
-  }
+  book: '3jn',
+  chapter: 1,
+  verse: 12,
+  quote: 'ὑπὸ αὐτῆς τῆς ἀληθείας',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'ὑπὸ',
+      occurrence: 2,
+      occurrences: 2,
+      reference: { chapter: 1, verse: 12 },
+    },
+    {
+      text: 'αὐτῆς',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 12 },
+    },
+    {
+      text: 'τῆς',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 12 },
+    },
+    {
+      text: 'ἀληθείας',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 12 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/3jn/1-14.js

@@ -1,8 +1,27 @@
 module.exports = {
-    book:"3jn",
-    chapter:1,
-    verse:14,
-    quote:"στόμα πρὸς στόμα",
-    occurrence:1,
-    expected: [{"text":"στόμα","occurrence":1,"occurrences":2},{"text":"πρὸς","occurrence":1,"occurrences":1},{"text":"στόμα","occurrence":2,"occurrences":2}]
-  }
+  book: '3jn',
+  chapter: 1,
+  verse: 14,
+  quote: 'στόμα πρὸς στόμα',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'στόμα',
+      occurrence: 1,
+      occurrences: 2,
+      reference: { chapter: 1, verse: 14 },
+    },
+    {
+      text: 'πρὸς',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 14 },
+    },
+    {
+      text: 'στόμα',
+      occurrence: 2,
+      occurrences: 2,
+      reference: { chapter: 1, verse: 14 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/3jn/1-15.js

@@ -1,8 +1,39 @@
 module.exports = {
-    book:"3jn",
-    chapter:1,
-    verse:15,
-    quote:"ἀσπάζου τοὺς φίλους κατ’ ὄνομα",
-    occurrence:1,
-    expected: [{"text":"ἀσπάζου","occurrence":1,"occurrences":1},{"text":"τοὺς","occurrence":1,"occurrences":1},{"text":"φίλους","occurrence":1,"occurrences":1},{"text":"κατ’","occurrence":1,"occurrences":1},{"text":"ὄνομα","occurrence":1,"occurrences":1}]
-  }
+  book: '3jn',
+  chapter: 1,
+  verse: 15,
+  quote: 'ἀσπάζου τοὺς φίλους κατ’ ὄνομα',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'ἀσπάζου',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 15 },
+    },
+    {
+      text: 'τοὺς',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 15 },
+    },
+    {
+      text: 'φίλους',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 15 },
+    },
+    {
+      text: 'κατ’',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 15 },
+    },
+    {
+      text: 'ὄνομα',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 1, verse: 15 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/php/2-1-2.js

@@ -0,0 +1,33 @@
+module.exports = {
+  book: 'php',
+  chapter: 2,
+  verse: 1,
+  quote: 'εἴ…εἴ…εἴ…εἴ',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'εἴ',
+      occurrence: 1,
+      occurrences: 4,
+      reference: { chapter: 2, verse: 1 },
+    },
+    {
+      text: 'εἴ',
+      occurrence: 2,
+      occurrences: 4,
+      reference: { chapter: 2, verse: 1 },
+    },
+    {
+      text: 'εἴ',
+      occurrence: 3,
+      occurrences: 4,
+      reference: { chapter: 2, verse: 1 },
+    },
+    {
+      text: 'εἴ',
+      occurrence: 4,
+      occurrences: 4,
+      reference: { chapter: 2, verse: 1 },
+    },
+  ],
+};

__tests__/fixtures/highlighting/php/2-1-3.js

@@ -0,0 +1,33 @@
+module.exports = {
+  book: 'php',
+  chapter: 2,
+  verse: 1,
+  quote: 'τις…τι…τις…τις',
+  occurrence: 1,
+  expected: [
+    {
+      text: 'τις',
+      occurrence: 1,
+      occurrences: 3,
+      reference: { chapter: 2, verse: 1 },
+    },
+    {
+      text: 'τι',
+      occurrence: 1,
+      occurrences: 1,
+      reference: { chapter: 2, verse: 1 },
+    },
+    {
+      text: 'τις',
+      occurrence: 2,
+      occurrences: 3,
+      reference: { chapter: 2, verse: 1 },
+    },
+    {
+      text: 'τις',
+      occurrence: 3,
+      occurrences: 3,
+      reference: { chapter: 2, verse: 1 },
+    },
+  ],
+};