scripture-guide 1.0.16 → 1.0.17

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.
@@ -1,6 +1,5 @@
1
1
  module.exports = {
2
2
  ko:{
3
- wordBreak: -1,
4
3
  books:[
5
4
  "창세기","출애굽기","레위기","민수기","신명기","여호수아","사사기","룻기","사무엘상","사무엘하","열왕기상","열왕기하","역대상","역대하","에스라","느헤미야","에스더","욥기","시편","잠언","전도서","아가","이사야","예레미야","예레미야애가","에스겔","다니엘","호세아","요엘","아모스","오바댜","요나","미가","나훔","하박국","스바냐","학개","스가랴","말라기",
6
5
  "마태복음","마가복음","누가복음","요한복음","사도행전","로마서","고린도전서","고린도후서","갈라디아서","에페소서","빌립보서","골로새서","데살로니가전서","데살로니가후서","디모데전서","디모데후서","디도서","빌레몬서","히브리서","야고보서","베드로전서","베드로후서","요한일서","요한이서","요한삼서","유다서","요한 계시록",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "scripture-guide",
3
- "version": "1.0.16",
3
+ "version": "1.0.17",
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": {
@@ -27,7 +27,7 @@ var preProcess = function preProcess(i) {
27
27
  return i;
28
28
  };
29
29
  var setLanguage = function setLanguage(language) {
30
- var _raw_lang$lang, _raw_lang$lang2, _raw_lang$lang3, _raw_lang$lang4, _raw_lang$lang5, _raw_lang$lang6, _raw_lang$lang7, _raw_lang$lang8, _raw_lang$lang9, _raw_lang$lang10;
30
+ var _raw_lang$lang, _raw_lang$lang2, _raw_lang$lang3, _raw_lang$lang4, _raw_lang$lang5, _raw_lang$lang6, _raw_lang$lang7, _raw_lang$lang8;
31
31
  lang = language;
32
32
  var new_index = {};
33
33
  if ((_raw_lang$lang = raw_lang[lang]) !== null && _raw_lang$lang !== void 0 && _raw_lang$lang.books) {
@@ -40,28 +40,30 @@ var setLanguage = function setLanguage(language) {
40
40
  raw_index = new_index;
41
41
  }
42
42
  //if(raw_lang[lang]?.regex) raw_regex.books = [];
43
- var _iterator = _createForOfIteratorHelper((_raw_lang$lang10 = raw_lang[lang]) === null || _raw_lang$lang10 === void 0 ? void 0 : _raw_lang$lang10.regex),
43
+ var _iterator = _createForOfIteratorHelper((_raw_lang$lang8 = raw_lang[lang]) === null || _raw_lang$lang8 === void 0 ? void 0 : _raw_lang$lang8.regex),
44
44
  _step;
45
45
  try {
46
46
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
47
47
  var regexitem = _step.value;
48
48
  raw_regex.books.push(regexitem);
49
49
  }
50
+
51
+ //if(raw_lang[lang]?.wordBreak==-1) wordBreak = "";
52
+ //else wordBreak = raw_lang[lang]?.wordBreak || wordBreak;
50
53
  } catch (err) {
51
54
  _iterator.e(err);
52
55
  } finally {
53
56
  _iterator.f();
54
57
  }
55
- if (((_raw_lang$lang2 = raw_lang[lang]) === null || _raw_lang$lang2 === void 0 ? void 0 : _raw_lang$lang2.wordBreak) == -1) wordBreak = "";else wordBreak = ((_raw_lang$lang3 = raw_lang[lang]) === null || _raw_lang$lang3 === void 0 ? void 0 : _raw_lang$lang3.wordBreak) || wordBreak;
56
- if ((_raw_lang$lang4 = raw_lang[lang]) !== null && _raw_lang$lang4 !== void 0 && _raw_lang$lang4.postProcess) postProcess = (_raw_lang$lang5 = raw_lang[lang]) === null || _raw_lang$lang5 === void 0 ? void 0 : _raw_lang$lang5.postProcess;
58
+ if ((_raw_lang$lang2 = raw_lang[lang]) !== null && _raw_lang$lang2 !== void 0 && _raw_lang$lang2.postProcess) postProcess = (_raw_lang$lang3 = raw_lang[lang]) === null || _raw_lang$lang3 === void 0 ? void 0 : _raw_lang$lang3.postProcess;
57
59
  if (typeof postProcess !== 'function') postProcess = function postProcess(i) {
58
60
  return i;
59
61
  };
60
- if ((_raw_lang$lang6 = raw_lang[lang]) !== null && _raw_lang$lang6 !== void 0 && _raw_lang$lang6.preProcess) preProcess = (_raw_lang$lang7 = raw_lang[lang]) === null || _raw_lang$lang7 === void 0 ? void 0 : _raw_lang$lang7.preProcess;
62
+ if ((_raw_lang$lang4 = raw_lang[lang]) !== null && _raw_lang$lang4 !== void 0 && _raw_lang$lang4.preProcess) preProcess = (_raw_lang$lang5 = raw_lang[lang]) === null || _raw_lang$lang5 === void 0 ? void 0 : _raw_lang$lang5.preProcess;
61
63
  if (typeof preProcess !== 'function') preProcess = function preProcess(i) {
62
64
  return i;
63
65
  };
64
- if ((_raw_lang$lang8 = raw_lang[lang]) !== null && _raw_lang$lang8 !== void 0 && _raw_lang$lang8.matchRules) lang_extra = (_raw_lang$lang9 = raw_lang[lang]) === null || _raw_lang$lang9 === void 0 ? void 0 : _raw_lang$lang9.matchRules;
66
+ if ((_raw_lang$lang6 = raw_lang[lang]) !== null && _raw_lang$lang6 !== void 0 && _raw_lang$lang6.matchRules) lang_extra = (_raw_lang$lang7 = raw_lang[lang]) === null || _raw_lang$lang7 === void 0 ? void 0 : _raw_lang$lang7.matchRules;
65
67
  };
66
68
  var lookupReference = function lookupReference(query) {
67
69
  var isValidReference = query && typeof query === 'string' && query.length > 0;
@@ -159,6 +161,8 @@ var strToHash = function strToHash(str) {
159
161
  };
160
162
  var cleanReference = function cleanReference(messyReference) {
161
163
  var ref = messyReference.replace(/[\s]+/g, " ").trim();
164
+ var hasNoAlpha = !/[A-Za-z]/.test(ref);
165
+ if (hasNoAlpha) wordBreak = "";
162
166
  ref = preProcess(ref);
163
167
 
164
168
  //Build Regex rules
@@ -486,9 +490,12 @@ var loadMaxVerse = function loadMaxVerse(book, chapter) {
486
490
  };
487
491
  var detectReferences = function detectReferences(content, callBack) {
488
492
  var _content$match;
493
+ var wordBreak = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "\\b";
489
494
  callBack = callBack ? callBack : function (i) {
490
495
  return "[".concat(i, "]");
491
496
  };
497
+ var hasNoAlpha = !/[A-Za-z]/.test(content);
498
+ if (hasNoAlpha && wordBreak) wordBreak = "";
492
499
  var src = raw_regex.books.map(function (i) {
493
500
  return i[0];
494
501
  });
@@ -498,7 +505,7 @@ var detectReferences = function detectReferences(content, callBack) {
498
505
  var bookMatchList = [].concat(_toConsumableArray(dst), _toConsumableArray(src)).map(function (i) {
499
506
  return [i];
500
507
  });
501
- var pattern = preparePattern(bookMatchList, wordBreak = "", lang_extra);
508
+ var pattern = preparePattern(bookMatchList, wordBreak, lang_extra);
502
509
  var blacklist_pattern = prepareBlacklist();
503
510
  var matches = ((_content$match = content.match(pattern)) === null || _content$match === void 0 ? void 0 : _content$match.filter(function (i) {
504
511
  return !blacklist_pattern.test(i);
package/scriptures.js CHANGED
@@ -23,8 +23,9 @@ const setLanguage = function(language) {
23
23
  for(let regexitem of raw_lang[lang]?.regex) {
24
24
  raw_regex.books.push(regexitem);
25
25
  }
26
- if(raw_lang[lang]?.wordBreak==-1) wordBreak = "";
27
- else wordBreak = raw_lang[lang]?.wordBreak || wordBreak;
26
+
27
+ //if(raw_lang[lang]?.wordBreak==-1) wordBreak = "";
28
+ //else wordBreak = raw_lang[lang]?.wordBreak || wordBreak;
28
29
 
29
30
 
30
31
  if(raw_lang[lang]?.postProcess) postProcess = raw_lang[lang]?.postProcess;
@@ -39,6 +40,7 @@ const setLanguage = function(language) {
39
40
 
40
41
  const lookupReference = function(query) {
41
42
 
43
+
42
44
  const isValidReference = query && typeof query === 'string' && query.length > 0;
43
45
  if (!isValidReference) return {
44
46
  "query": query,
@@ -146,8 +148,12 @@ const strToHash = function(str) {
146
148
 
147
149
 
148
150
  const cleanReference = function(messyReference) {
151
+
149
152
  let ref = messyReference.replace(/[\s]+/g, " ").trim();
150
153
 
154
+ const hasNoAlpha = !/[A-Za-z]/.test(ref);
155
+ if(hasNoAlpha) wordBreak = "";
156
+
151
157
  ref = preProcess(ref);
152
158
 
153
159
 
@@ -167,7 +173,6 @@ const cleanReference = function(messyReference) {
167
173
  const hash = strToHash(book);
168
174
  hashCypher[book] = hash;
169
175
  }
170
-
171
176
  for (let i in regex) {
172
177
  var re = new RegExp( wordBreak +regex[i][0] + "\\.*"+wordBreak, "ig");
173
178
  let replacement = hashCypher[regex[i][1]] || regex[i][1];
@@ -477,14 +482,17 @@ const loadMaxVerse = function(book, chapter) {
477
482
 
478
483
 
479
484
 
480
- const detectReferences = (content,callBack) => {
485
+ const detectReferences = (content,callBack,wordBreak="\\b") => {
481
486
 
482
487
  callBack = callBack ? callBack : (i)=>{return `[${i}]`};
488
+
489
+ const hasNoAlpha = !/[A-Za-z]/.test(content);
490
+ if(hasNoAlpha && wordBreak) wordBreak = "";
483
491
 
484
492
  const src = raw_regex.books.map(i => i[0]);
485
493
  const dst = [...new Set(raw_regex.books.map(i => i[1]))];
486
494
  const bookMatchList = [...dst, ...src].map(i => [i]);
487
- const pattern = preparePattern(bookMatchList,wordBreak="",lang_extra);
495
+ const pattern = preparePattern(bookMatchList,wordBreak,lang_extra);
488
496
  const blacklist_pattern = prepareBlacklist();
489
497
  var matches = content.match(pattern)?.filter(i=>!blacklist_pattern.test(i)) || [];
490
498
  matches = matches.map(i => i.trim().replace(/[,;!?.]+/ig, "").trim());
package/test-detect.js CHANGED
@@ -13,7 +13,7 @@ lines.forEach(l=>{
13
13
  console.log({result});
14
14
  });
15
15
 
16
- process.exit(0);
16
+ //process.exit(0);
17
17
 
18
18
  setLanguage("ko");
19
19
 
@@ -30,8 +30,7 @@ const ko_lines = [
30
30
  ]
31
31
  ko_lines.forEach(l=>{
32
32
  let callback = (string)=>{
33
- const verse_ids = lookup(string).verse_ids;
34
- return JSON.stringify({string,verse_ids});
33
+ return `[${string}]`
35
34
  }
36
35
  const result = detectReferences(l,callback);
37
36
  console.log({result});
package/test.js CHANGED
@@ -23,7 +23,8 @@ let testcases =
23
23
  ["Compound reference in different books","Exodus 5:1; Leviticus 6:2; Numbers 8:5"],
24
24
  ["Compound reference ranges in different books","Exodus 5:1-3; Leviticus 6:2-5; Numbers 8:5-6"],
25
25
  ["Entire Book Range","Genesis - Numbers"],
26
- ["Abbreviation detection","Mt2.5;Mk3;Lk4;Jn5.2-6;1Jn1.5,7-8;3Jn1.1"]
26
+ ["Abbreviation detection","Mt2.5;Mk3;Lk4;Jn5.2-6;1Jn1.5,7-8;3Jn1.1"],
27
+ ["Other Books","1 Nephi 19:11"]
27
28
 
28
29
  ]
29
30