scripture-guide 1.0.78 → 1.0.80

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.
@@ -937,7 +937,7 @@ const getEffectiveLanguage = function(explicitLanguage) {
937
937
  return explicitLanguage || getStoredLanguage() || defaultLanguage || 'en';
938
938
  };
939
939
 
940
- const lookupReference = function(query, language = null) {
940
+ const lookupReference = function(query, language = null, lookupConfig = {}) {
941
941
  const isValidReference = query && typeof query === 'string' && query.length > 0;
942
942
  if (!isValidReference) return {
943
943
  "query": query,
@@ -947,32 +947,73 @@ const lookupReference = function(query, language = null) {
947
947
 
948
948
  // Get effective language (explicit > stored > default > 'en')
949
949
  const effectiveLanguage = getEffectiveLanguage(language);
950
- const config = getLanguageConfig(effectiveLanguage);
951
950
 
952
- //Cleanup
951
+ // Try lookup in the requested language first
952
+ const verse_ids = lookupInLanguage(query, effectiveLanguage);
953
+
954
+ if (verse_ids?.length) {
955
+ return {
956
+ "query": query,
957
+ "ref": generateReference(verse_ids, effectiveLanguage),
958
+ "verse_ids": verse_ids
959
+ };
960
+ }
961
+
962
+ // If no results and multi-language lookup is allowed, try fallback languages
963
+ if (!lookupConfig.noMulti) {
964
+ return lookupWithLanguageFallback(query, effectiveLanguage);
965
+ }
966
+
967
+ return {
968
+ "query": query,
969
+ "ref": "",
970
+ "verse_ids": []
971
+ };
972
+ }
973
+
974
+ const lookupInLanguage = function(query, language) {
975
+ const config = getLanguageConfig(language);
976
+
977
+ // Cleanup and process the reference
953
978
  let ref = cleanReference(query, config);
954
- //Break compound reference into array of single references
955
979
  let refs = splitReferences(ref, config);
956
980
 
957
- //Lookup each single reference individually, return the set
981
+ // Lookup each single reference individually, return the set
958
982
  let verse_ids = [];
959
983
  for (let i in refs) {
960
984
  verse_ids = verse_ids.concat(lookupSingleRef(refs[i], config));
961
985
  }
986
+
987
+ return verse_ids;
988
+ }
962
989
 
963
- // Fallback to English if no results found and language was specified
964
- if(!verse_ids?.length && effectiveLanguage && effectiveLanguage !== 'en') {
965
- const results = lookupReference(query, 'en');
966
- return results;
990
+ const lookupWithLanguageFallback = function(query, targetLanguage) {
991
+ // Define fallback order: English first (if not already tried), then all other languages
992
+ const fallbackLanguages = targetLanguage !== 'en'
993
+ ? ['en', ...Object.keys(raw_lang).filter(lang => lang !== 'en' && lang !== targetLanguage)]
994
+ : Object.keys(raw_lang).filter(lang => lang !== targetLanguage);
995
+
996
+ for (const lang of fallbackLanguages) {
997
+ const verse_ids = lookupInLanguage(query, lang);
998
+ if (verse_ids?.length) {
999
+ // Generate reference in the target language
1000
+ const refInTargetLanguage = generateReference(verse_ids, targetLanguage);
1001
+ return {
1002
+ "query": query,
1003
+ "ref": refInTargetLanguage,
1004
+ "verse_ids": verse_ids
1005
+ };
1006
+ }
967
1007
  }
968
1008
 
969
1009
  return {
970
1010
  "query": query,
971
- "ref": ref,
972
- "verse_ids": verse_ids
1011
+ "ref": "",
1012
+ "verse_ids": []
973
1013
  };
974
1014
  }
975
1015
 
1016
+
976
1017
  const lookupSingleRef = function(ref, config) {
977
1018
  const booksWithDashRegex = /^(joseph|조셉)/i; // TODO: get from config
978
1019
  //todo: better handling of multi-book ranges for unicode
@@ -937,7 +937,7 @@ const getEffectiveLanguage = function(explicitLanguage) {
937
937
  return explicitLanguage || getStoredLanguage() || defaultLanguage || 'en';
938
938
  };
939
939
 
940
- const lookupReference = function(query, language = null) {
940
+ const lookupReference = function(query, language = null, lookupConfig = {}) {
941
941
  const isValidReference = query && typeof query === 'string' && query.length > 0;
942
942
  if (!isValidReference) return {
943
943
  "query": query,
@@ -947,32 +947,73 @@ const lookupReference = function(query, language = null) {
947
947
 
948
948
  // Get effective language (explicit > stored > default > 'en')
949
949
  const effectiveLanguage = getEffectiveLanguage(language);
950
- const config = getLanguageConfig(effectiveLanguage);
951
950
 
952
- //Cleanup
951
+ // Try lookup in the requested language first
952
+ const verse_ids = lookupInLanguage(query, effectiveLanguage);
953
+
954
+ if (verse_ids?.length) {
955
+ return {
956
+ "query": query,
957
+ "ref": generateReference(verse_ids, effectiveLanguage),
958
+ "verse_ids": verse_ids
959
+ };
960
+ }
961
+
962
+ // If no results and multi-language lookup is allowed, try fallback languages
963
+ if (!lookupConfig.noMulti) {
964
+ return lookupWithLanguageFallback(query, effectiveLanguage);
965
+ }
966
+
967
+ return {
968
+ "query": query,
969
+ "ref": "",
970
+ "verse_ids": []
971
+ };
972
+ }
973
+
974
+ const lookupInLanguage = function(query, language) {
975
+ const config = getLanguageConfig(language);
976
+
977
+ // Cleanup and process the reference
953
978
  let ref = cleanReference(query, config);
954
- //Break compound reference into array of single references
955
979
  let refs = splitReferences(ref, config);
956
980
 
957
- //Lookup each single reference individually, return the set
981
+ // Lookup each single reference individually, return the set
958
982
  let verse_ids = [];
959
983
  for (let i in refs) {
960
984
  verse_ids = verse_ids.concat(lookupSingleRef(refs[i], config));
961
985
  }
986
+
987
+ return verse_ids;
988
+ }
962
989
 
963
- // Fallback to English if no results found and language was specified
964
- if(!verse_ids?.length && effectiveLanguage && effectiveLanguage !== 'en') {
965
- const results = lookupReference(query, 'en');
966
- return results;
990
+ const lookupWithLanguageFallback = function(query, targetLanguage) {
991
+ // Define fallback order: English first (if not already tried), then all other languages
992
+ const fallbackLanguages = targetLanguage !== 'en'
993
+ ? ['en', ...Object.keys(raw_lang).filter(lang => lang !== 'en' && lang !== targetLanguage)]
994
+ : Object.keys(raw_lang).filter(lang => lang !== targetLanguage);
995
+
996
+ for (const lang of fallbackLanguages) {
997
+ const verse_ids = lookupInLanguage(query, lang);
998
+ if (verse_ids?.length) {
999
+ // Generate reference in the target language
1000
+ const refInTargetLanguage = generateReference(verse_ids, targetLanguage);
1001
+ return {
1002
+ "query": query,
1003
+ "ref": refInTargetLanguage,
1004
+ "verse_ids": verse_ids
1005
+ };
1006
+ }
967
1007
  }
968
1008
 
969
1009
  return {
970
1010
  "query": query,
971
- "ref": ref,
972
- "verse_ids": verse_ids
1011
+ "ref": "",
1012
+ "verse_ids": []
973
1013
  };
974
1014
  }
975
1015
 
1016
+
976
1017
  const lookupSingleRef = function(ref, config) {
977
1018
  const booksWithDashRegex = /^(joseph|조셉)/i; // TODO: get from config
978
1019
  //todo: better handling of multi-book ranges for unicode
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "scripture-guide",
3
- "version": "1.0.78",
3
+ "version": "1.0.80",
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": "dist/scriptures.cjs",
6
6
  "module": "dist/scriptures.mjs",