codexparser 0.0.64 → 0.0.67

package/all-scripture-test.js

@@ -9,14 +9,11 @@ const parser = new CodexParser({
     invalid_sequence_strategy: "include",
     invalid_passage_strategy: "include",
 })
-const text =
-    "Joel 10:13 The passages Luke 2:32 and Lk 1:23 that we are looking at tonight 1 Cor 12:34 2 Cor 3:4 are found Jude 6, in Jude 5, Genesis 2:1 - 3:19, 1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles. Ps 109:4,5,6,8.  Isaiah 61.2-3 Mt 5.4"
+const text = `Joel 10:13 The passages Luke 2:32 and Lk 1:23 that we are looking at tonight  1 Cor 12:34 2 Cor 3:4 are found Jude 6, in Jude 5, Genesis 2:1 - 3:19,  1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles.  Ps 109:4,5,6,8.  Isaiah 61.2-3 Mt 5.4`
 const single = "Ge 27.27-29,89-40 Heb 11.20 Heb. 12.17 Jonah 3"
 const jd = "Jd. 5"
 const cor = "1 Cor 12:4 2 Cor 3:4"
 const noSpace = "Re13.8 "
 const ezra = " Ez 1:3"
 const passages = parser.parse(text + single + jd + cor + noSpace + ezra)
-passages.getPassages().forEach((passage) => {
-    dump(passage)
-})
+dump(passages.getPassages())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.64",
+  "version": "0.0.67",
   "description": "This is a Javascript Bible parser and text scanner. It will search through texts and collate all scripture references into an array and parse them into objects, and it will parse passages into objects by book, chapter, verse, and testament. ",
   "main": "index.js",
   "scripts": {

package/src/CodexParser.js

@@ -89,56 +89,46 @@ class CodexParser {
         }
         this.passages = []
         this.scan(reference)
-        const books = []
         for (let i = 0; i < this.found.length; i++) {
-            books.push(this.found[i].start.b)
-        }
-        const uniqueBooks = [...new Set(books)]
-
-        const booksWithResults = []
-        for (const book of uniqueBooks) {
-            const found = this.found.filter((passage) => passage.start.b === book)
-            booksWithResults.push(found)
-        }
-
-        for (let i = 0; i < booksWithResults.length; i++) {
-            const results = booksWithResults[i]
-            for (let j = 0; j < results.length; j++) {
-                const result = results[j]
-
-                const passage = {
-                    book: this.bookify(result.start.b),
-                    chapter: result.start.c,
-                    verses: this.versify(result),
-                    type: result.type,
-                }
-                passage.testament = this.bible.old.includes(passage.book) ? "old" : "new"
-                let next = results[j + 1]
-                while (next && next.type === "integer" && next.end.c === result.start.c) {
-                    passage.verses.push(next.start.v)
-                    if (next.end.v !== next.start.v) passage.verses.push(next.end.v)
-                    passage.subType = next.type
-                    j++
-                    next = results[j + 1]
-                }
-                if (passage.type === "range") {
-                    if (result.start.c !== result.end.c) {
-                        passage.verses = [result.start.v]
-                        passage.to = {
-                            book: this.bookify(result.end.b),
-                            chapter: result.end.c,
-                            verses: result.end.v,
-                        }
+            const result = this.found[i]
+            const passage = {
+                book: this.bookify(result.start.b),
+                chapter: result.start.c,
+                verses: this.versify(result),
+                type: result.type,
+            }
+            passage.testament = this.bible.old.includes(passage.book) ? "old" : "new"
+            let next = this.found[i + 1]
+            while (next && next.type === "integer" && next.start.b === result.end.b && next.end.c === result.start.c) {
+                passage.verses.push(next.start.v)
+                if (next.end.v !== next.start.v) passage.verses.push(next.end.v)
+                passage.subType = next.type
+                i++
+                next = this.found[i + 1]
+            }
+            if (passage.type === "range") {
+                if (result.start.c !== result.end.c) {
+                    passage.verses = [result.start.v]
+                    passage.to = {
+                        book: this.bookify(result.end.b),
+                        chapter: result.end.c,
+                        verses: result.end.v,
                     }
                 }
-                passage.original = result.osis
-                passage.scripture = this.scripturize(passage)
-                passage.indices = result.indices
-                passage.entities = result.entities
-                this.passages.push(passage)
             }
+            passage.original = result.osis
+            passage.scripture = this.scripturize(passage)
+            passage.indices = result.indices
+            passage.entities = result.entities
+            if (passage.entities[0].translations) {
+                passage.version = {
+                    name: passage.entities[0].translations[0].translation,
+                    alias: passage.entities[0].translations[0].alias,
+                    abbreviation: passage.entities[0].translations[0].osis,
+                }
+            }
+            this.passages.push(passage)
         }
-        this.passages.sort((a, b) => a.chapter - b.chapter)
         this.found = []
         return this
     }

package/sub-verse-scripture-test.js

@@ -6,6 +6,10 @@ const dump = (item) => {
 }
 const string = "Malachi 3:32"
 const parser = new BibleParser()
-parser.options({ invalid_passage_strategy: "include", invalid_sequence_strategy: "include" })
-const result = parser.parse("Philippians 4:18")
+parser.options({
+    invalid_passage_strategy: "include",
+    invalid_sequence_strategy: "include",
+    single_chapter_1_strategy: "verse",
+})
+const result = parser.parse("Ex 9.16 LXX")
 dump(result.getPassages())