scripture-guide 1.0.10 → 1.0.12
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 +1 -1
- package/scriptures-compiled.js +26 -26
- package/scriptures.js +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "scripture-guide",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.12",
|
|
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-compiled.js",
|
|
6
6
|
"scripts": {
|
package/scriptures-compiled.js
CHANGED
|
@@ -16,7 +16,7 @@ var lookupReference = function lookupReference(query) {
|
|
|
16
16
|
var refs = splitReferences(ref);
|
|
17
17
|
|
|
18
18
|
//Lookup each single reference individually, return the set
|
|
19
|
-
verse_ids = [];
|
|
19
|
+
var verse_ids = [];
|
|
20
20
|
for (var _i in refs) {
|
|
21
21
|
verse_ids = verse_ids.concat(lookupSingleRef(refs[_i]));
|
|
22
22
|
}
|
|
@@ -56,7 +56,7 @@ var generateReference = function generateReference(verse_ids) {
|
|
|
56
56
|
if (!verse_ids) return '';
|
|
57
57
|
var ranges = loadVerseStructure(verse_ids);
|
|
58
58
|
var refs = loadRefsFromRanges(ranges);
|
|
59
|
-
ref = refs.join("; ");
|
|
59
|
+
var ref = refs.join("; ");
|
|
60
60
|
return ref;
|
|
61
61
|
};
|
|
62
62
|
var lookupMultiBookRange = function lookupMultiBookRange(cleanRef) {
|
|
@@ -143,7 +143,6 @@ var getRanges = function getRanges(ref) {
|
|
|
143
143
|
var chapterStartandEnd = chapterRanges[_i7].split(/-/);
|
|
144
144
|
var startChapter = parseInt(chapterStartandEnd[0], 0);
|
|
145
145
|
var endChapter = parseInt(chapterStartandEnd[1], 0);
|
|
146
|
-
var chapterRange = [];
|
|
147
146
|
for (_i7 = startChapter; _i7 <= endChapter; _i7++) {
|
|
148
147
|
ranges.push(_i7 + ": 1-X");
|
|
149
148
|
}
|
|
@@ -166,11 +165,11 @@ var getRanges = function getRanges(ref) {
|
|
|
166
165
|
var _chapterStartandEnd = numbers.split(/-/);
|
|
167
166
|
var _startChapter = parseInt(_chapterStartandEnd[0], 0);
|
|
168
167
|
var _endChapter = parseInt(_chapterStartandEnd[1], 0);
|
|
169
|
-
var
|
|
168
|
+
var chapterRange = [];
|
|
170
169
|
for (i = _startChapter; i <= _endChapter; i++) {
|
|
171
|
-
|
|
170
|
+
chapterRange.push(i);
|
|
172
171
|
}
|
|
173
|
-
ranges =
|
|
172
|
+
ranges = chapterRange.map(function (chapter) {
|
|
174
173
|
return chapter + ": 1-X";
|
|
175
174
|
});
|
|
176
175
|
}
|
|
@@ -183,19 +182,20 @@ var getRanges = function getRanges(ref) {
|
|
|
183
182
|
var mostRecentChapter = null;
|
|
184
183
|
var split = numbers.split(/,/);
|
|
185
184
|
var verses = null;
|
|
185
|
+
var _chapter = null;
|
|
186
186
|
for (var _i8 in split) {
|
|
187
187
|
// 2:2 OR 1:1-4
|
|
188
188
|
if (split[_i8].match(/:/)) {
|
|
189
189
|
var pieces = split[_i8].split(/:/);
|
|
190
|
-
|
|
190
|
+
_chapter = mostRecentChapter = pieces[0];
|
|
191
191
|
verses = pieces[1];
|
|
192
192
|
}
|
|
193
193
|
//3 or 6-7
|
|
194
194
|
else {
|
|
195
|
-
|
|
195
|
+
_chapter = mostRecentChapter;
|
|
196
196
|
verses = split[_i8];
|
|
197
197
|
}
|
|
198
|
-
ranges.push(
|
|
198
|
+
ranges.push(_chapter + ": " + verses.trim());
|
|
199
199
|
}
|
|
200
200
|
}
|
|
201
201
|
// Genesis 1:3,5
|
|
@@ -252,16 +252,16 @@ var loadVerseIds = function loadVerseIds(book, ranges) {
|
|
|
252
252
|
var range = ranges[_i11];
|
|
253
253
|
var matches = range.match(/(\d+): *([\dX]+)-*([\dX]*)/);
|
|
254
254
|
if (!matches) continue;
|
|
255
|
-
var
|
|
255
|
+
var _chapter2 = parseInt(matches[1]);
|
|
256
256
|
var start = parseInt(matches[2]);
|
|
257
257
|
var end = matches[3];
|
|
258
258
|
if (end == '') end = start;
|
|
259
|
-
if (end == "X") end = loadMaxVerse(book,
|
|
259
|
+
if (end == "X") end = loadMaxVerse(book, _chapter2);else end = parseInt(end);
|
|
260
260
|
for (var verse_num = start; verse_num <= end; verse_num++) {
|
|
261
261
|
if (refIndex[book] == undefined) continue;
|
|
262
|
-
if (refIndex[book][
|
|
263
|
-
if (refIndex[book][
|
|
264
|
-
verseList.push(refIndex[book][
|
|
262
|
+
if (refIndex[book][_chapter2] == undefined) continue;
|
|
263
|
+
if (refIndex[book][_chapter2][verse_num] == undefined) continue;
|
|
264
|
+
verseList.push(refIndex[book][_chapter2][verse_num]);
|
|
265
265
|
}
|
|
266
266
|
}
|
|
267
267
|
return verseList;
|
|
@@ -296,7 +296,7 @@ var loadRefsFromRanges = function loadRefsFromRanges(ranges) {
|
|
|
296
296
|
var refs = [];
|
|
297
297
|
var mostRecentBook, mostRecentChapter;
|
|
298
298
|
for (var _i14 in ranges) {
|
|
299
|
-
var
|
|
299
|
+
var ref = '';
|
|
300
300
|
var start_bk = ranges[_i14][0][0];
|
|
301
301
|
var end_bk = ranges[_i14][1][0];
|
|
302
302
|
var start_ch = ranges[_i14][0][1];
|
|
@@ -308,38 +308,38 @@ var loadRefsFromRanges = function loadRefsFromRanges(ranges) {
|
|
|
308
308
|
if (start_bk == mostRecentBook) start_bk = '';
|
|
309
309
|
if (start_bk == mostRecentBook && start_ch == mostRecentChapter) start_ch = '';
|
|
310
310
|
if (start_vs == end_vs) {
|
|
311
|
-
|
|
311
|
+
ref = start_bk + " " + start_ch + ":" + start_vs;
|
|
312
312
|
} else {
|
|
313
313
|
if (start_vs == 1 && end_vs == loadMaxVerse(start_bk, start_ch))
|
|
314
314
|
//whole chapter
|
|
315
315
|
{
|
|
316
|
-
|
|
316
|
+
ref = start_bk + " " + start_ch;
|
|
317
317
|
} else {
|
|
318
|
-
|
|
318
|
+
ref = start_bk + " " + start_ch + ":" + start_vs + "-" + end_vs;
|
|
319
319
|
}
|
|
320
320
|
}
|
|
321
321
|
} else {
|
|
322
322
|
if (start_vs == 1) {
|
|
323
|
-
|
|
323
|
+
ref = start_bk + " " + start_ch + "-" + end_ch + ":" + end_vs;
|
|
324
324
|
} else {
|
|
325
|
-
|
|
325
|
+
ref = start_bk + " " + start_ch + ":" + start_vs + "-" + end_ch + ":" + end_vs;
|
|
326
326
|
}
|
|
327
327
|
}
|
|
328
328
|
} else {
|
|
329
329
|
if (start_vs == 1 && end_vs == loadMaxVerse(end_bk, end_ch)) {
|
|
330
|
-
|
|
330
|
+
ref = start_bk + " " + start_ch + " - " + end_bk + " " + end_ch;
|
|
331
331
|
} else if (end_vs == loadMaxVerse(end_bk, end_ch)) {
|
|
332
|
-
|
|
332
|
+
ref = start_bk + " " + start_ch + ":" + start_vs + " - " + end_bk + " " + end_ch;
|
|
333
333
|
} else if (start_vs == 1) {
|
|
334
|
-
|
|
334
|
+
ref = start_bk + " " + start_ch + " - " + end_bk + " " + end_ch + ":" + end_vs;
|
|
335
335
|
} else {
|
|
336
|
-
|
|
336
|
+
ref = start_bk + " " + start_ch + ":" + start_vs + " - " + end_bk + " " + end_ch + ":" + end_vs;
|
|
337
337
|
}
|
|
338
338
|
}
|
|
339
339
|
if (start_bk != '') mostRecentBook = start_bk;
|
|
340
340
|
if (start_ch != '') mostRecentChapter = start_ch;
|
|
341
|
-
|
|
342
|
-
refs.push(
|
|
341
|
+
ref = ref.replace(/^\s+:*/, '').trim();
|
|
342
|
+
refs.push(ref);
|
|
343
343
|
}
|
|
344
344
|
return refs;
|
|
345
345
|
};
|
package/scriptures.js
CHANGED
|
@@ -17,7 +17,7 @@ const lookupReference = function(query) {
|
|
|
17
17
|
let refs = splitReferences(ref);
|
|
18
18
|
|
|
19
19
|
//Lookup each single reference individually, return the set
|
|
20
|
-
verse_ids = [];
|
|
20
|
+
let verse_ids = [];
|
|
21
21
|
for (let i in refs) {
|
|
22
22
|
verse_ids = verse_ids.concat(lookupSingleRef(refs[i]));
|
|
23
23
|
}
|
|
@@ -60,7 +60,7 @@ const generateReference = function(verse_ids) {
|
|
|
60
60
|
|
|
61
61
|
let ranges = loadVerseStructure(verse_ids);
|
|
62
62
|
let refs = loadRefsFromRanges(ranges);
|
|
63
|
-
ref = refs.join("; ");
|
|
63
|
+
let ref = refs.join("; ");
|
|
64
64
|
return ref;
|
|
65
65
|
|
|
66
66
|
}
|
|
@@ -157,7 +157,6 @@ const getRanges = function(ref) {
|
|
|
157
157
|
let chapterStartandEnd = chapterRanges[i].split(/-/);
|
|
158
158
|
let startChapter = parseInt(chapterStartandEnd[0], 0);
|
|
159
159
|
let endChapter = parseInt(chapterStartandEnd[1], 0);
|
|
160
|
-
let chapterRange = [];
|
|
161
160
|
for (i = startChapter; i <= endChapter; i++) {
|
|
162
161
|
ranges.push(i + ": 1-X");
|
|
163
162
|
}
|
|
@@ -193,6 +192,7 @@ const getRanges = function(ref) {
|
|
|
193
192
|
let mostRecentChapter = null;
|
|
194
193
|
let split = numbers.split(/,/);
|
|
195
194
|
let verses = null;
|
|
195
|
+
let chapter = null;
|
|
196
196
|
for (let i in split) {
|
|
197
197
|
// 2:2 OR 1:1-4
|
|
198
198
|
if (split[i].match(/:/)) {
|