scripture-guide 1.0.78 → 1.0.79

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,74 @@ 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);
950
+ console.log(`Lookup reference: ${query} in ${effectiveLanguage}`);
951
951
 
952
- //Cleanup
952
+ // Try lookup in the requested language first
953
+ const verse_ids = lookupInLanguage(query, effectiveLanguage);
954
+
955
+ if (verse_ids?.length) {
956
+ return {
957
+ "query": query,
958
+ "ref": generateReference(verse_ids, effectiveLanguage),
959
+ "verse_ids": verse_ids
960
+ };
961
+ }
962
+
963
+ // If no results and multi-language lookup is allowed, try fallback languages
964
+ if (!lookupConfig.noMulti) {
965
+ return lookupWithLanguageFallback(query, effectiveLanguage);
966
+ }
967
+
968
+ return {
969
+ "query": query,
970
+ "ref": "",
971
+ "verse_ids": []
972
+ };
973
+ }
974
+
975
+ const lookupInLanguage = function(query, language) {
976
+ const config = getLanguageConfig(language);
977
+
978
+ // Cleanup and process the reference
953
979
  let ref = cleanReference(query, config);
954
- //Break compound reference into array of single references
955
980
  let refs = splitReferences(ref, config);
956
981
 
957
- //Lookup each single reference individually, return the set
982
+ // Lookup each single reference individually, return the set
958
983
  let verse_ids = [];
959
984
  for (let i in refs) {
960
985
  verse_ids = verse_ids.concat(lookupSingleRef(refs[i], config));
961
986
  }
987
+
988
+ return verse_ids;
989
+ }
962
990
 
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;
991
+ const lookupWithLanguageFallback = function(query, targetLanguage) {
992
+ // Define fallback order: English first (if not already tried), then all other languages
993
+ const fallbackLanguages = targetLanguage !== 'en'
994
+ ? ['en', ...Object.keys(raw_lang).filter(lang => lang !== 'en' && lang !== targetLanguage)]
995
+ : Object.keys(raw_lang).filter(lang => lang !== targetLanguage);
996
+
997
+ for (const lang of fallbackLanguages) {
998
+ const verse_ids = lookupInLanguage(query, lang);
999
+ if (verse_ids?.length) {
1000
+ // Generate reference in the target language
1001
+ const refInTargetLanguage = generateReference(verse_ids, targetLanguage);
1002
+ return {
1003
+ "query": query,
1004
+ "ref": refInTargetLanguage,
1005
+ "verse_ids": verse_ids
1006
+ };
1007
+ }
967
1008
  }
968
1009
 
969
1010
  return {
970
1011
  "query": query,
971
- "ref": ref,
972
- "verse_ids": verse_ids
1012
+ "ref": "",
1013
+ "verse_ids": []
973
1014
  };
974
1015
  }
975
1016
 
1017
+
976
1018
  const lookupSingleRef = function(ref, config) {
977
1019
  const booksWithDashRegex = /^(joseph|조셉)/i; // TODO: get from config
978
1020
  //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,74 @@ 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);
950
+ console.log(`Lookup reference: ${query} in ${effectiveLanguage}`);
951
951
 
952
- //Cleanup
952
+ // Try lookup in the requested language first
953
+ const verse_ids = lookupInLanguage(query, effectiveLanguage);
954
+
955
+ if (verse_ids?.length) {
956
+ return {
957
+ "query": query,
958
+ "ref": generateReference(verse_ids, effectiveLanguage),
959
+ "verse_ids": verse_ids
960
+ };
961
+ }
962
+
963
+ // If no results and multi-language lookup is allowed, try fallback languages
964
+ if (!lookupConfig.noMulti) {
965
+ return lookupWithLanguageFallback(query, effectiveLanguage);
966
+ }
967
+
968
+ return {
969
+ "query": query,
970
+ "ref": "",
971
+ "verse_ids": []
972
+ };
973
+ }
974
+
975
+ const lookupInLanguage = function(query, language) {
976
+ const config = getLanguageConfig(language);
977
+
978
+ // Cleanup and process the reference
953
979
  let ref = cleanReference(query, config);
954
- //Break compound reference into array of single references
955
980
  let refs = splitReferences(ref, config);
956
981
 
957
- //Lookup each single reference individually, return the set
982
+ // Lookup each single reference individually, return the set
958
983
  let verse_ids = [];
959
984
  for (let i in refs) {
960
985
  verse_ids = verse_ids.concat(lookupSingleRef(refs[i], config));
961
986
  }
987
+
988
+ return verse_ids;
989
+ }
962
990
 
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;
991
+ const lookupWithLanguageFallback = function(query, targetLanguage) {
992
+ // Define fallback order: English first (if not already tried), then all other languages
993
+ const fallbackLanguages = targetLanguage !== 'en'
994
+ ? ['en', ...Object.keys(raw_lang).filter(lang => lang !== 'en' && lang !== targetLanguage)]
995
+ : Object.keys(raw_lang).filter(lang => lang !== targetLanguage);
996
+
997
+ for (const lang of fallbackLanguages) {
998
+ const verse_ids = lookupInLanguage(query, lang);
999
+ if (verse_ids?.length) {
1000
+ // Generate reference in the target language
1001
+ const refInTargetLanguage = generateReference(verse_ids, targetLanguage);
1002
+ return {
1003
+ "query": query,
1004
+ "ref": refInTargetLanguage,
1005
+ "verse_ids": verse_ids
1006
+ };
1007
+ }
967
1008
  }
968
1009
 
969
1010
  return {
970
1011
  "query": query,
971
- "ref": ref,
972
- "verse_ids": verse_ids
1012
+ "ref": "",
1013
+ "verse_ids": []
973
1014
  };
974
1015
  }
975
1016
 
1017
+
976
1018
  const lookupSingleRef = function(ref, config) {
977
1019
  const booksWithDashRegex = /^(joseph|조셉)/i; // TODO: get from config
978
1020
  //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.79",
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",