scripture-guide 1.0.19 → 1.0.21
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/data/scriptlang.js +1 -0
- package/package.json +1 -1
- package/scriptures-compiled.js +10 -8
- package/scriptures.js +2 -0
- package/test-lang.js +7 -0
package/data/scriptlang.js
CHANGED
|
@@ -149,6 +149,7 @@ module.exports = {
|
|
|
149
149
|
i = i.replace(/\s*:\s*([0-9~]+)/g, "$1절");
|
|
150
150
|
i = i.replace(/;/g, "; ").replace(/\s+/g, " ").trim();
|
|
151
151
|
i = i.replace(/제\s*([3-4])장\s*니파이/g, "제$1니파이");
|
|
152
|
+
i = i.replace(/([0-9]+)장\s*([0-9]+)/g, "$1장 $2");
|
|
152
153
|
return i;
|
|
153
154
|
},
|
|
154
155
|
preProcess:(i)=>{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "scripture-guide",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.21",
|
|
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
|
@@ -279,6 +279,7 @@ var getRanges = function getRanges(ref) {
|
|
|
279
279
|
else if (isRange && isSplit) {
|
|
280
280
|
var mostRecentChapter = null;
|
|
281
281
|
var split = numbers.split(/,/);
|
|
282
|
+
var chapter = null;
|
|
282
283
|
var verses = null;
|
|
283
284
|
for (var _i5 in split) {
|
|
284
285
|
// 2:2 OR 1:1-4
|
|
@@ -299,20 +300,21 @@ var getRanges = function getRanges(ref) {
|
|
|
299
300
|
else if (isSplit) {
|
|
300
301
|
var _split = numbers.split(/,/);
|
|
301
302
|
var _mostRecentChapter = null;
|
|
303
|
+
var _chapter = null;
|
|
302
304
|
var _verses = null;
|
|
303
305
|
for (var _i6 in _split) {
|
|
304
306
|
//Genesis 1:1-5
|
|
305
307
|
if (_split[_i6].match(/:/)) {
|
|
306
308
|
var _pieces = numbers.split(/:/);
|
|
307
|
-
|
|
309
|
+
_chapter = _mostRecentChapter = _pieces[0];
|
|
308
310
|
_verses = _pieces[1];
|
|
309
311
|
}
|
|
310
312
|
//10
|
|
311
313
|
else {
|
|
312
|
-
|
|
314
|
+
_chapter = _mostRecentChapter;
|
|
313
315
|
_verses = _split[_i6];
|
|
314
316
|
}
|
|
315
|
-
ranges.push(
|
|
317
|
+
ranges.push(_chapter + ": " + _verses.trim());
|
|
316
318
|
}
|
|
317
319
|
}
|
|
318
320
|
//Genesis 1:1-10 OR Exodus 1-2:15 OR Leviticus 1:10-2:5
|
|
@@ -350,16 +352,16 @@ var loadVerseIds = function loadVerseIds(book, ranges) {
|
|
|
350
352
|
var range = ranges[i];
|
|
351
353
|
var matches = range.match(/(\d+): *([\dX]+)-*([\dX]*)/);
|
|
352
354
|
if (!matches) continue;
|
|
353
|
-
var
|
|
355
|
+
var chapter = parseInt(matches[1]);
|
|
354
356
|
var start = parseInt(matches[2]);
|
|
355
357
|
var end = matches[3];
|
|
356
358
|
if (end == '') end = start;
|
|
357
|
-
if (end == "X") end = loadMaxVerse(book,
|
|
359
|
+
if (end == "X") end = loadMaxVerse(book, chapter);else end = parseInt(end);
|
|
358
360
|
for (var verse_num = start; verse_num <= end; verse_num++) {
|
|
359
361
|
if (refIndex[book] == undefined) continue;
|
|
360
|
-
if (refIndex[book][
|
|
361
|
-
if (refIndex[book][
|
|
362
|
-
verseList.push(refIndex[book][
|
|
362
|
+
if (refIndex[book][chapter] == undefined) continue;
|
|
363
|
+
if (refIndex[book][chapter][verse_num] == undefined) continue;
|
|
364
|
+
verseList.push(refIndex[book][chapter][verse_num]);
|
|
363
365
|
}
|
|
364
366
|
}
|
|
365
367
|
return verseList;
|
package/scriptures.js
CHANGED
|
@@ -265,6 +265,7 @@ const getRanges = function(ref) {
|
|
|
265
265
|
else if (isRange && isSplit) {
|
|
266
266
|
let mostRecentChapter = null;
|
|
267
267
|
let split = numbers.split(/,/);
|
|
268
|
+
let chapter = null;
|
|
268
269
|
let verses = null;
|
|
269
270
|
for (let i in split) {
|
|
270
271
|
// 2:2 OR 1:1-4
|
|
@@ -285,6 +286,7 @@ const getRanges = function(ref) {
|
|
|
285
286
|
else if (isSplit) {
|
|
286
287
|
let split = numbers.split(/,/);
|
|
287
288
|
let mostRecentChapter = null;
|
|
289
|
+
let chapter = null;
|
|
288
290
|
let verses = null;
|
|
289
291
|
for (let i in split) {
|
|
290
292
|
//Genesis 1:1-5
|
package/test-lang.js
CHANGED
|
@@ -40,6 +40,13 @@ let testcases = [
|
|
|
40
40
|
["Numbered Books","요삼1.1"],
|
|
41
41
|
];
|
|
42
42
|
|
|
43
|
+
testcases = [
|
|
44
|
+
["test1","니파이전서 5장 1-4"],
|
|
45
|
+
["test1","니파이전서 5:1-4"],
|
|
46
|
+
["test1","니파이전서 5장"],
|
|
47
|
+
["test1","니전5.1-2"]
|
|
48
|
+
];
|
|
49
|
+
|
|
43
50
|
for (let i in testcases)
|
|
44
51
|
{
|
|
45
52
|
console.log("\n===================\n\nTEST CASE #"+(parseInt(i)+1)+": "+testcases[i][0]);
|