scripture-guide 1.0.73 → 1.0.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "scripture-guide",
3
- "version": "1.0.73",
3
+ "version": "1.0.75",
4
4
  "description": "A utility for biblical and scripture reference parsing that enables structured queries based on strings of traditional scripture references (e.g. John 3:16). ",
5
5
  "main": "scriptures.cjs",
6
6
  "module": "scriptures.mjs",
package/scriptures.cjs CHANGED
@@ -1419,7 +1419,7 @@ var processReferenceDetection = function processReferenceDetection(content, book
1419
1419
  return content.substring(start, end).trim();
1420
1420
  });
1421
1421
  //console.log({matches,matchIndeces,gapsBetweenIndeces,gapStrings});
1422
- joiners = lang_extra.joiners || ["^[;, ]*(and|c\\.*f\\.*)*$"];
1422
+ var joiners = lang_extra.joiners || ["^[;, ]*(and|c\\.*f\\.*)*$"];
1423
1423
  var gapThatMayBeMerged = gapsBetweenIndeces.map(function (_ref15, i) {
1424
1424
  var _ref16 = _slicedToArray(_ref15, 2),
1425
1425
  start = _ref16[0],
@@ -1485,7 +1485,7 @@ var processReferenceDetection = function processReferenceDetection(content, book
1485
1485
  var maxCount = Math.max(cutItems.length, negativeItems.length);
1486
1486
  //merge by alternating cutItems and negativeItems. run the callback on the cut items
1487
1487
  var merged = [];
1488
- for (i = 0; i < maxCount; i++) {
1488
+ for (var i = 0; i < maxCount; i++) {
1489
1489
  var firstItem = firstReferenceIsAtStart ? cutItems[i] : negativeItems[i];
1490
1490
  var secondItem = firstReferenceIsAtStart ? negativeItems[i] : cutItems[i];
1491
1491
  if (firstItem) merged.push(firstItem);
@@ -1555,8 +1555,8 @@ var _lookupReference = exports.ref2VerseId = exports.read = exports.parse = expo
1555
1555
 
1556
1556
  //Lookup each single reference individually, return the set
1557
1557
  var verse_ids = [];
1558
- for (var _i in refs) {
1559
- verse_ids = verse_ids.concat(lookupSingleRef(refs[_i], config));
1558
+ for (var i in refs) {
1559
+ verse_ids = verse_ids.concat(lookupSingleRef(refs[i], config));
1560
1560
  }
1561
1561
 
1562
1562
  // Fallback to English if no results found and language was specified
@@ -1631,13 +1631,13 @@ var lookupMultiBookRange = function lookupMultiBookRange(cleanRef, config) {
1631
1631
  var start = lookupSingleRef(range[0], config)[0];
1632
1632
  var end = lookupSingleRef(range[1], config)[0];
1633
1633
  var all_verse_ids = [];
1634
- for (var _i2 = start; _i2 <= end; _i2++) all_verse_ids.push(_i2);
1634
+ for (var i = start; i <= end; i++) all_verse_ids.push(i);
1635
1635
  return all_verse_ids;
1636
1636
  };
1637
1637
  var strToHash = function strToHash(str) {
1638
1638
  var hash = 0;
1639
- for (var _i3 = 0; _i3 < str.length; _i3++) {
1640
- hash = hash * 31 + str.charCodeAt(_i3);
1639
+ for (var i = 0; i < str.length; i++) {
1640
+ hash = hash * 31 + str.charCodeAt(i);
1641
1641
  //max 32
1642
1642
  if (hash > 2147483647) hash = hash % 2147483647;
1643
1643
  }
@@ -1648,9 +1648,9 @@ var cleanReference = function cleanReference(messyReference, config) {
1648
1648
 
1649
1649
  //Build Regex rules
1650
1650
  var regex = config.raw_regex.pre_rules;
1651
- for (var _i4 in regex) {
1652
- var re = new RegExp(regex[_i4][0], "ig");
1653
- ref = ref.replace(re, regex[_i4][1]);
1651
+ for (var i in regex) {
1652
+ var re = new RegExp(regex[i][0], "ig");
1653
+ ref = ref.replace(re, regex[i][1]);
1654
1654
  }
1655
1655
 
1656
1656
  //Turn dots into colons
@@ -1679,15 +1679,15 @@ var cleanReference = function cleanReference(messyReference, config) {
1679
1679
  });
1680
1680
  regex = bookMatchList;
1681
1681
  var hashCypher = {};
1682
- for (var _i5 in regex) {
1683
- var _regex$_i = _slicedToArray(regex[_i5], 2),
1682
+ for (var _i in regex) {
1683
+ var _regex$_i = _slicedToArray(regex[_i], 2),
1684
1684
  book = _regex$_i[1];
1685
1685
  var hash = strToHash(book);
1686
1686
  hashCypher[book] = hash;
1687
1687
  }
1688
- for (var _i6 in regex) {
1689
- var re = new RegExp(wordBreak + buffer + regex[_i6][0] + buffer + "\\.*" + wordBreak, "ig");
1690
- var replacement = hashCypher[regex[_i6][1]] || regex[_i6][1];
1688
+ for (var _i2 in regex) {
1689
+ var re = new RegExp(wordBreak + buffer + regex[_i2][0] + buffer + "\\.*" + wordBreak, "ig");
1690
+ var replacement = hashCypher[regex[_i2][1]] || regex[_i2][1];
1691
1691
  ref = (buffer + ref + buffer).replace(re, replacement).trim();
1692
1692
  }
1693
1693
  var books = Object.keys(hashCypher);
@@ -1725,8 +1725,8 @@ var splitReferences = function splitReferences(compoundReference, config) {
1725
1725
  var refs = compoundReference.split(/\s*;\s*/);
1726
1726
  var runningBook = "";
1727
1727
  var completeRefs = [];
1728
- for (var _i7 in refs) {
1729
- var ref = refs[_i7];
1728
+ for (var i in refs) {
1729
+ var ref = refs[i];
1730
1730
  var pieces = ref.split(/([0-9:,-]+)$/);
1731
1731
  var firstPiece = pieces[0].trim();
1732
1732
  runningBook = bookExists(firstPiece, config) ? firstPiece : runningBook;
@@ -1752,20 +1752,20 @@ var getRanges = function getRanges(ref) {
1752
1752
  // Genesis 1,3-5
1753
1753
  if (isChaptersOnly && isSplit && isRange) {
1754
1754
  var chapterRanges = numbers.split(/,/);
1755
- for (var _i8 in chapterRanges) {
1755
+ for (var i in chapterRanges) {
1756
1756
  //3-5
1757
- if (chapterRanges[_i8].match(/-/)) {
1758
- var chapterStartandEnd = chapterRanges[_i8].split(/-/);
1757
+ if (chapterRanges[i].match(/-/)) {
1758
+ var chapterStartandEnd = chapterRanges[i].split(/-/);
1759
1759
  var startChapter = parseInt(chapterStartandEnd[0], 0);
1760
1760
  var endChapter = parseInt(chapterStartandEnd[1], 0);
1761
1761
  var chapterRange = [];
1762
- for (leti = startChapter; _i8 <= endChapter; _i8++) {
1763
- ranges.push(_i8 + ": 1-X");
1762
+ for (leti = startChapter; i <= endChapter; i++) {
1763
+ ranges.push(i + ": 1-X");
1764
1764
  }
1765
1765
  }
1766
1766
  //1
1767
1767
  else {
1768
- ranges.push(chapterRanges[_i8] + ": 1-X");
1768
+ ranges.push(chapterRanges[i] + ": 1-X");
1769
1769
  }
1770
1770
  }
1771
1771
  }
@@ -1782,8 +1782,8 @@ var getRanges = function getRanges(ref) {
1782
1782
  var _startChapter = parseInt(_chapterStartandEnd[0], 0);
1783
1783
  var _endChapter = parseInt(_chapterStartandEnd[1], 0);
1784
1784
  var _chapterRange = [];
1785
- for (var _i9 = _startChapter; _i9 <= _endChapter; _i9++) {
1786
- _chapterRange.push(_i9);
1785
+ for (var _i3 = _startChapter; _i3 <= _endChapter; _i3++) {
1786
+ _chapterRange.push(_i3);
1787
1787
  }
1788
1788
  ranges = _chapterRange.map(function (chapter) {
1789
1789
  return chapter + ": 1-X";
@@ -1799,17 +1799,17 @@ var getRanges = function getRanges(ref) {
1799
1799
  var split = numbers.split(/,/);
1800
1800
  var chapter = null;
1801
1801
  var verses = null;
1802
- for (var _i0 in split) {
1802
+ for (var _i4 in split) {
1803
1803
  // 2:2 OR 1:1-4
1804
- if (split[_i0].match(/:/)) {
1805
- var pieces = split[_i0].split(/:/);
1804
+ if (split[_i4].match(/:/)) {
1805
+ var pieces = split[_i4].split(/:/);
1806
1806
  chapter = mostRecentChapter = pieces[0];
1807
1807
  verses = pieces[1];
1808
1808
  }
1809
1809
  //3 or 6-7
1810
1810
  else {
1811
1811
  chapter = mostRecentChapter;
1812
- verses = split[_i0];
1812
+ verses = split[_i4];
1813
1813
  }
1814
1814
  ranges.push(chapter + ": " + verses.trim());
1815
1815
  }
@@ -1820,9 +1820,9 @@ var getRanges = function getRanges(ref) {
1820
1820
  var _mostRecentChapter = null;
1821
1821
  var _chapter = null;
1822
1822
  var _verses = null;
1823
- for (var _i1 in _split) {
1823
+ for (var _i5 in _split) {
1824
1824
  //Genesis 1:1-5
1825
- if (_split[_i1].match(/:/)) {
1825
+ if (_split[_i5].match(/:/)) {
1826
1826
  var _pieces = numbers.split(/:/);
1827
1827
  _chapter = _mostRecentChapter = _pieces[0];
1828
1828
  _verses = _pieces[1];
@@ -1830,7 +1830,7 @@ var getRanges = function getRanges(ref) {
1830
1830
  //10
1831
1831
  else {
1832
1832
  _chapter = _mostRecentChapter;
1833
- _verses = _split[_i1];
1833
+ _verses = _split[_i5];
1834
1834
  }
1835
1835
  ranges.push(_chapter + ": " + _verses.trim());
1836
1836
  }
@@ -1846,12 +1846,12 @@ var getRanges = function getRanges(ref) {
1846
1846
  _verses2 = _verses2.map(function (v) {
1847
1847
  return parseInt(v.replace(/\D/g, '').trim());
1848
1848
  });
1849
- for (var _i10 = _chapters[0]; _i10 <= _chapters[1]; _i10++) {
1849
+ for (var _i6 = _chapters[0]; _i6 <= _chapters[1]; _i6++) {
1850
1850
  var start = 1;
1851
1851
  var end = "X";
1852
- if (_chapters[0] == _i10) start = _verses2[0];
1853
- if (_chapters[1] == _i10) end = _verses2[_verses2.length - 1];
1854
- ranges.push(_i10 + ": " + start + "-" + end);
1852
+ if (_chapters[0] == _i6) start = _verses2[0];
1853
+ if (_chapters[1] == _i6) end = _verses2[_verses2.length - 1];
1854
+ ranges.push(_i6 + ": " + start + "-" + end);
1855
1855
  }
1856
1856
  } else {
1857
1857
  ranges = [numbers];
@@ -1862,10 +1862,10 @@ var getRanges = function getRanges(ref) {
1862
1862
  var loadVerseIds = function loadVerseIds(book, ranges, config) {
1863
1863
  var refIndex = loadRefIndex(config);
1864
1864
  var verseList = [];
1865
- for (var _i11 in ranges)
1865
+ for (var i in ranges)
1866
1866
  //Assumption: 1 range is within a single chapter
1867
1867
  {
1868
- var range = ranges[_i11];
1868
+ var range = ranges[i];
1869
1869
  var matches = range.match(/(\d+): *([\dX]+)-*([\dX]*)/);
1870
1870
  if (!matches) continue;
1871
1871
  var chapter = parseInt(matches[1]);
@@ -1886,9 +1886,9 @@ var loadVerseStructure = function loadVerseStructure(verse_ids, config) {
1886
1886
  var verseIdIndex = loadVerseIdIndex(config);
1887
1887
  var segments = consecutiveSplitter(verse_ids);
1888
1888
  var structure = [];
1889
- for (var _i12 in segments) {
1890
- var min = segments[_i12][0];
1891
- var max = segments[_i12][segments[_i12].length - 1];
1889
+ for (var i in segments) {
1890
+ var min = segments[i][0];
1891
+ var max = segments[i][segments[i].length - 1];
1892
1892
  structure.push([verseIdIndex[min], verseIdIndex[max]]);
1893
1893
  }
1894
1894
  return structure;
@@ -1897,13 +1897,13 @@ var consecutiveSplitter = function consecutiveSplitter(verse_ids) {
1897
1897
  var segments = [];
1898
1898
  var segment = [];
1899
1899
  var previousVerseId = 0;
1900
- for (var _i13 in verse_ids) {
1901
- if (verse_ids[_i13] != previousVerseId + 1 && previousVerseId != 0) {
1900
+ for (var i in verse_ids) {
1901
+ if (verse_ids[i] != previousVerseId + 1 && previousVerseId != 0) {
1902
1902
  segments.push(segment);
1903
1903
  segment = [];
1904
1904
  }
1905
- segment.push(verse_ids[_i13]);
1906
- previousVerseId = verse_ids[_i13];
1905
+ segment.push(verse_ids[i]);
1906
+ previousVerseId = verse_ids[i];
1907
1907
  }
1908
1908
  segments.push(segment);
1909
1909
  return segments;
@@ -1911,14 +1911,14 @@ var consecutiveSplitter = function consecutiveSplitter(verse_ids) {
1911
1911
  var loadRefsFromRanges = function loadRefsFromRanges(ranges, config) {
1912
1912
  var refs = [];
1913
1913
  var mostRecentBook, mostRecentChapter;
1914
- for (var _i14 in ranges) {
1914
+ for (var i in ranges) {
1915
1915
  var ref = '';
1916
- var start_bk = ranges[_i14][0][0];
1917
- var end_bk = ranges[_i14][1][0];
1918
- var start_ch = ranges[_i14][0][1];
1919
- var end_ch = ranges[_i14][1][1];
1920
- var start_vs = ranges[_i14][0][2];
1921
- var end_vs = ranges[_i14][1][2];
1916
+ var start_bk = ranges[i][0][0];
1917
+ var end_bk = ranges[i][1][0];
1918
+ var start_ch = ranges[i][0][1];
1919
+ var end_ch = ranges[i][1][1];
1920
+ var start_vs = ranges[i][0][2];
1921
+ var end_vs = ranges[i][1][2];
1922
1922
  if (start_bk == end_bk) {
1923
1923
  if (start_ch == end_ch) {
1924
1924
  if (start_bk == mostRecentBook) start_bk = '';
@@ -2064,7 +2064,7 @@ var getLanguageConfig = function getLanguageConfig(language) {
2064
2064
  var bookList = Object.keys(langData.books);
2065
2065
  var _loop = function _loop() {
2066
2066
  var _Object$keys;
2067
- var book = _bookList[_i15];
2067
+ var book = _bookList[_i7];
2068
2068
  var book_index = bookList.indexOf(book);
2069
2069
  var original_bookname = (_Object$keys = Object.keys(raw_index_orig)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[book_index];
2070
2070
  if (original_bookname) {
@@ -2075,7 +2075,7 @@ var getLanguageConfig = function getLanguageConfig(language) {
2075
2075
  return [i, book];
2076
2076
  }));
2077
2077
  };
2078
- for (var _i15 = 0, _bookList = bookList; _i15 < _bookList.length; _i15++) {
2078
+ for (var _i7 = 0, _bookList = bookList; _i7 < _bookList.length; _i7++) {
2079
2079
  _loop();
2080
2080
  }
2081
2081
  config.raw_index = new_index;
package/scriptures.mjs CHANGED
@@ -821,7 +821,7 @@ const processReferenceDetection = (content,books,lang_extra,lookupReference,call
821
821
  },[]);
822
822
  const gapStrings = gapsBetweenIndeces.map(([start,end])=>content.substring(start,end).trim());
823
823
  //console.log({matches,matchIndeces,gapsBetweenIndeces,gapStrings});
824
- joiners = lang_extra.joiners || ["^[;, ]*(and|c\\.*f\\.*)*$"];
824
+ const joiners = lang_extra.joiners || ["^[;, ]*(and|c\\.*f\\.*)*$"];
825
825
  const gapThatMayBeMerged = gapsBetweenIndeces.map(([start,end],i)=>{
826
826
  const gapString = gapStrings[i];
827
827
  const canBeMerged = joiners.some(joiner=>(new RegExp(joiner,"ig")).test(gapString));
@@ -877,7 +877,7 @@ const processReferenceDetection = (content,books,lang_extra,lookupReference,call
877
877
  const maxCount = Math.max(cutItems.length,negativeItems.length);
878
878
  //merge by alternating cutItems and negativeItems. run the callback on the cut items
879
879
  const merged = [];
880
- for(i=0;i<maxCount;i++){
880
+ for(let i=0;i<maxCount;i++){
881
881
  const firstItem = firstReferenceIsAtStart ? cutItems[i] : negativeItems[i];
882
882
  const secondItem = firstReferenceIsAtStart ? negativeItems[i] : cutItems[i];
883
883
  if(firstItem) merged.push(firstItem);