codexparser 0.0.31 → 0.0.33

package/all-scripture-test.js

@@ -5,14 +5,16 @@ 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:34 2 Cor 3:4. He 4.12 Re 1.16 Leviticus 16.6 He 5.3 He 7.27"
+const cor = "Hos 1:1-3, 8 Song of Solomon 1:2, Song of Songs 2:2. Ezek 17:3. Ezekiel 17:3"
 const passages = parser.parse(single)
 console.log(passages)
 
 const jude = parser.parse(jd)
 console.log(jude)
-const textParser = parser.parse(cor)
-console.log(textParser)
+
 
 const fullText = parser.parse(text)
-console.log(fullText)
+console.log(fullText)
+
+const textParser = parser.parse(cor)
+console.log(textParser)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "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": {
@@ -16,6 +16,7 @@
     "@babel/preset-react": "^7.23.3",
     "axios": "^1.7.2",
     "babel-loader": "^9.1.3",
+    "glob": "^10.4.1",
     "path": "^0.12.7",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"

package/src/CodexParser.js

@@ -63,6 +63,7 @@ class CodexParser {
                     verse = []
                 }
             }
+            console.log(verse)
             const passage = {
                 original: this.found[i].replace(/([.,])\1*$/, "").trim(),
                 book: this.bookify(book),
@@ -105,7 +106,7 @@ class CodexParser {
         let bookified
         book = book[0].charAt(0).toUpperCase() + book[0].slice(1)
         bookified = this.abbrevations[book]
-
+        
         if (!bookified) {
             bookified = this.bible.new.find(
                 (b) =>

package/src/bible.js

@@ -22,6 +22,7 @@ module.exports = {
         "Proverbs",
         "Ecclesiastes",
         "Song of Solomon",
+        "Song of Songs",
         "Isaiah",
         "Jeremiah",
         "Lamentations",

package/src/bookRegex.regex

@@ -0,0 +1 @@
+Genesis|Gen|Ge|Gn|Ex|Exo|Exod|Exodus|Exodus|Leviticus|Lev|Le|Lv|Numbers|Num|Nu|Deuteronomy|Dt|Dt|Joshua|Josh|Jsh|Judges|Jdg|Jdg|Ruth|Rth|Ru|1 Samuel|1 Sam|1 Sa|1 S|I Sam|I Sa|1Sam|1Sa|1S|1st Samuel|1st Sam|First Samuel|First Sam|2 Samuel|2 Sam|2 Sa|2 S|II Sam|II Sa|2Sam|2Sa|2S|2nd Samuel|2nd Sam|Second Samuel|Second Sam|1 Kings|1 Kgs|1 Ki|1Kgs|1Kin|1Ki|1K|I Kgs|I Ki|1st Kings|1st Kgs|2 Kings|2 Kgs|2 Ki|2Kgs|2Kin|2Ki|2K|II Kgs|II Ki|2nd Kings|2nd Kgs|1 Chronicles|1 Chron|1 Chr|1 Ch|1Chron|1Chr|1Ch|I Chron|I Chr|I Ch|1st Chronicles|1st Chron|First Chronicles|First Chron|2 Chronicles|2 Chron|2 Chr|2 Ch|2Chron|2Chr|2Ch|II Chron|II Chr|II Ch|2nd Chronicles|2nd Chron|Second Chronicles|Second Chron|Ezra|Ezr|Ezr|Ez|Nehemiah|Neh|Ne|Esther|Esth|Es|Job|Jb|Job|Jb|Psalms|Ps|Psalm|Pslm|Psa|Psm|Pss|Proverbs|Prov|Pro|Prv|Pr|Ecclesiastes|Eccles|Eccle|Ecc|Ec|Qoh|Song of Solomon|Song|SOS|So|Canticle of Canticles|Canticles|Cant|Isaiah|Isa|Is|Jeremiah|Jer|Je|Jr|Lamentations|Lam|La|Ezekiel|Ezek|Eze|Ezk|Daniel|Dan|Da|Dn|Hosea|Hos|Ho|Joel|Joel|Jl|Amos|Amos|Am|Obadiah|Obad|Ob|Jonah|Jonah|Jnh|Jon|Micah|Mic|Mc|Nahum|Nah|Na|Habakkuk|Hab|Hb|Zephaniah|Zeph|Zep|Zp|Haggai|Hag|Hg|Zechariah|Zechar|Zech|Zec|Zc|Malachi|Mal|Ml|Matthew|Matt|Mt|Mark|Mrk|Mar|Mk|Mr|Luke|Luk|Lk|John|Joh|Jhn|Jn|Acts|Act|Ac|Romans|Rom|Ro|Rm1Corinthians|1Cor|1Co|ICor|ICo|1Cor|1Co|ICorinthians|1Corinthians|1stCorinthians|FirstCorinthians|2Corinthians|2 Cor|2 Co|II Cor|II Co|2Cor|2Co|II Corinthians|2Corinthians|2nd Corinthians|Second Corinthians|Galatians|Gal|Ga|Ephesians|Eph|Ephes|Philippians|Phil|Php|Pp|Colossians|Col|Co|1 Thessalonians|1 Thess|1 Thes|1 Th|I Thessalonians|I Thess|I Thes|I Th|1Thessalonians|1Thess|1Thes|1Th|1st Thessalonians|1st Thess|First Thessalonians|First Thess|2 Thessalonians|2 Thess|2 Thes|2 Th|II Thessalonians|II Thess|II Thes|II Th|2Thessalonians|2Thess|2Thes|2Th|2nd Thessalonians|2nd Thess|Second Thessalonians|Second Thess|1 Timothy|1 Tim|1 Ti|I Timothy|I Tim|I Ti|1Timothy|1Tim|1Ti|1st Timothy|1st Tim|First Timothy|First Tim|2 Timothy|2 Tim|2 Ti|II Timothy|II Tim|II Ti|2Timothy|2Tim|2Ti|2nd Timothy|2nd Tim|Second Timothy|Second Tim|Titus|titus|tit|ti|Philemon|Philem|Phm|Pm|He|Hebrews|Heb|James|James|Jas|Jm|1 Peter|1 Pet|1 Pe|1 Pt|1 P|I Pet|I Pt|I Pe|1Peter|1Pet|1Pe|1Pt|1P|I Peter|1st Peter|First Peter|2 Peter|2 Pet|2 Pe|2 Pt|2 P|II Peter|II Pet|II Pt|II Pe|2Peter|2Pet|2Pe|2Pt|2P|II Peter|2nd Peter|Second Peter|1 John|1 Jhn|1 Jn|1 J|1John|1Jhn|1Joh|1Jn|1Jo|1J|I John|I Jhn|I Joh|I Jn|I Jo|1st John|First John|2 John|2 Jhn|2 Jn|2 J|2John|2Jhn|2Joh|2Jn|2Jo|2J|II John|II Jhn|II Joh|II Jn|II Jo|2nd John|Second John|3 John|3 Jhn|3 Jn|3 J|3John|3Jhn|3Joh|3Jn|3Jo|3J|III John|III Jhn|III Joh|III Jn|III Jo|3rd John|Third John|Jude|Jud|Jd|Revelation|Rev|Rev|The Revelation|Apoc

package/src/regex.js

@@ -1,10 +1,10 @@
-const bookRegex = /(?:(I+|1st|2nd|3rd|First|Second|Third|[123])\s)?(Gen|Ge|Gn|Exo|Ex|Exod|Lev|Le|Lv|Num|Nu|Nm|Nb|Deut|Dt|Josh|Jos|Jsh|Judg|Jdg|Jg|Jdgs|Rth|Ru|Sam|Samuel|Kings|Kgs|Kin|Chron|Chronicles|Ezra|Ezr|Ez|Neh|Ne|Esth|Es|Job|Job|Jb|Pslm|Ps|Psalms|Psa|Psm|Pss|Prov|Pr|Prv|Eccles|Ec|Song|So|Canticles|Song of Songs|SOS|Isa|Is|Jer|Je|Jr|Lam|La|Ezek|Eze|Ezk|Dan|Da|Dn|Hos|Ho|Joel|Joe|Jl|Amos|Am|Obad|Ob|Jnh|Jon|Micah|Mic|Nah|Na|Hab|Zeph|Zep|Zp|Haggai|Hag|Hg|Zech|Zec|Zc|Mal|Mal|Ml|Matt|Mt|Mrk|Mk|Mr|Luk|Lk|John|Jn|Jhn|Acts|Ac|Rom|Ro|Rm|Co|Cor|Corinthians|Gal|Ga|Ephes|Eph|Phil|Php|Col|Col|Th|Thes|Thess|Thessalonians|Ti|Tim|Timothy|Titus|Tit|Philem|Phm|Hebrews|Heb|He|James|Jas|Jm|Pe|Pet|Pt|Peter|Jn|Jo|Joh|Jhn|John|Jude|Jd|Jud|Jud|Rev|The Revelation|Genesis|Exodus|Leviticus|Numbers|Deuteronomy|Joshua|Judges|Ruth|Samuel|Kings|Chronicles|Ezra|Nehemiah|Esther|Job|Psalms|Psalm|Proverbs|Ecclesiastes|Song of Solomon|Isaiah|Jeremiah|Lamentations|Ezekiel|Daniel|Hosea|Joel|Amos|Obadiah|Jonah|Micah|Nahum|Habakkuk|Zephaniah|Haggai|Zechariah|Malachi|Matthew|Mark|Luke|John|Acts|Romans|Corinthians|Galatians|Ephesians|Philippians|Colossians|Thessalonians|Timothy|Titus|Philemon|Hebrews|James|Peter|John|Revelation|Re|Ap)/gmi
+const bookRegex = /(?:(I+|1st|2nd|3rd|First|Second|Third|[123])\s)?(Gen|Ge|Gn|Exo|Ex|Exod|Lev|Le|Lv|Num|Nu|Nm|Nb|Deut|Dt|Josh|Jos|Jsh|Judg|Jdg|Jg|Jdgs|Rth|Ru|Sam|Samuel|Kings|Kgs|Kin|Chron|Chronicles|Ezra|Ezr|Neh|Ne|Esth|Es|Job|Job|Jb|Pslm|Ps|Psalms|Psa|Psm|Pss|Prov|Pr|Prv|Eccles|Ec|Song|So|Canticles|Song of Songs|SOS|Song of Solomon|Isa|Is|Jer|Je|Jr|Lam|La|Ezek|Eze|Ezk|Dan|Da|Dn|Hos|Ho|Joel|Joe|Jl|Amos|Am|Obad|Ob|Jnh|Jon|Micah|Mic|Nah|Na|Hab|Zeph|Zep|Zp|Haggai|Hag|Hg|Zech|Zec|Zc|Mal|Mal|Ml|Matt|Mt|Mrk|Mk|Mr|Luk|Lk|John|Jn|Jhn|Acts|Ac|Rom|Ro|Rm|Co|Cor|Corinthians|Gal|Ga|Ephes|Eph|Phil|Php|Col|Col|Th|Thes|Thess|Thessalonians|Ti|Tim|Timothy|Titus|Tit|Philem|Phm|Hebrews|Heb|He|James|Jas|Jm|Pe|Pet|Pt|Peter|Jn|Jo|Joh|Jhn|John|Jude|Jd|Jud|Jud|Rev|The Revelation|Genesis|Exodus|Leviticus|Numbers|Deuteronomy|Joshua|Judges|Ruth|Samuel|Kings|Chronicles|Ezra|Nehemiah|Esther|Job|Psalms|Psalm|Proverbs|Ecclesiastes|Song of Solomon|Isaiah|Jeremiah|Lamentations|Ezekiel|Daniel|Hosea|Joel|Amos|Obadiah|Jonah|Micah|Nahum|Habakkuk|Zephaniah|Haggai|Zechariah|Malachi|Matthew|Mark|Luke|John|Acts|Romans|Corinthians|Galatians|Ephesians|Philippians|Colossians|Thessalonians|Timothy|Titus|Philemon|Hebrews|James|Peter|John|Revelation|Re|Ap)/gmi
 const chapterRegex = /\b(?:\.?\s?\d+[:|\.]?)\b/gm
-const verseRegex = /\b[:.](\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?:[abcde])?(?:,\d+)*\b/gm
+const verseRegex = /\b[:.](\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?:[abcde])?(?:,\d+)*(?:,\s?\d+)?\b/gm
 const chapterRange = /.?\s?(?:[-—–])\s?/gm
 const chapterRangeVerseRegex = /(?:.\d+)?/gm
 const chapterVerseRange =
-    /.?\s?\d+((?:[:.]\d+)?(\s?[-–—]\s?)?(?:\d+)(?:(,\s?\d+)*)?\S([:.]?\d+)?(,\s?\d+[–—-]\s?\d+)?)?(?:[:.]\d+)?(?:[abcde])?(?:,\d+)*(?:[-–—]\d?\s?)?/gim
+    /(.?\s?\d+((?:[:.]\d+)?(\s?[-–—]\s?)?(?:\d+)(?:(,\s?\d+)*)?([:.]?\d+)?(,?\s?\d+[–—-]\s?\d+,?\d+)?)?(?:[:.]\d+)?(?:[abcde])?(?:,\d+)*(?:[-–—]\d?\s?)?)(?:[:.]\d+[–-—]\s?\d+,?\s?\d+)?(?:(\d+)?,\s?\d+)?/gim
 const scripturesRegex = new RegExp(`(${bookRegex.source})(${chapterVerseRange.source})`, "gmi")
 module.exports.bookRegex = bookRegex
 module.exports.chapterRegex = chapterRegex

package/src/toc.js

@@ -1,5 +1,3 @@
 const fs = require("fs")
-
 const bible = JSON.parse(fs.readFileSync(__dirname + "/../bibles/updated_kjv.json", "utf8"))
-
 module.exports.bible = bible

package/sub-verse-scripture-test.js

@@ -1,6 +1,5 @@
 const CodexParser = require("./src/CodexParser.js")
 
 const parser = new CodexParser()
-const text = parser.parse("Nehemiah 1:1d")
-const multiNoSpace = parser.parse('Ps 109:4,5,7,8')
-console.log(multiNoSpace)
+const text = parser.parse("Joel 2:10, 11")
+console.log(text)

package/webpack.config.js

@@ -1,10 +1,6 @@
-import path from "path"
-import { fileURLToPath } from "url"
+const path = require("path")
 
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-export default {
+module.exports = {
     entry: {
         main: "./src/CodexParser.js",
     },