waha-shared 1.0.307 → 1.0.308

package/dist/functions/languages.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBibleInfo = getBibleInfo;
 exports.getLanguageInfo = getLanguageInfo;
 exports.getInitialAppInterfaceLanguage = getInitialAppInterfaceLanguage;
 exports.isLanguageAvailable = isLanguageAvailable;
@@ -7,12 +8,12 @@ exports.numerals = numerals;
 exports.getAppTranslations = getAppTranslations;
 exports.getMeetTranslations = getMeetTranslations;
 const bibleAudios_1 = require("../data/bibleAudios");
+const bibleStatuses_1 = require("../data/bibleStatuses");
 const bibleTexts_1 = require("../data/bibleTexts");
 const curriculumFoundations_1 = require("../data/curriculumFoundations");
 const curriculumQuestions_1 = require("../data/curriculumQuestions");
 const curriculumTopics_1 = require("../data/curriculumTopics");
 const languages_1 = require("../data/languages");
-const lessonPauses_1 = require("../data/lessonPauses");
 const numeralMaps_1 = require("../data/numeralMaps");
 const phoneLanguages_1 = require("../data/phoneLanguages");
 const scripts_1 = require("../data/scripts");
@@ -23,7 +24,27 @@ const translationsIntroduction_1 = require("../data/translationsIntroduction");
 const translationsQuestion_1 = require("../data/translationsQuestion");
 const translationsSet_1 = require("../data/translationsSet");
 const translationsSpokenQuestion_1 = require("../data/translationsSpokenQuestion");
-const bibles_1 = require("./bibles");
+const bibleChapterUtils_1 = require("./bibleChapterUtils");
+function getBibleInfo(bibleId) {
+    const bibleText = bibleTexts_1.bibleTexts.find((t) => t.bibleTextId === bibleId);
+    const bibleAudio = bibleAudios_1.bibleAudios.find((t) => t.bibleAudioId === bibleText?.audioId ||
+        t.bibleAudioId === bibleText?.bibleTextId);
+    const language = languages_1.languages.find((l) => l.languageId === bibleText?.languageId) ??
+        languages_1.languages[0];
+    const script = scripts_1.scripts.find((s) => s.name === language?.script) ?? scripts_1.scripts[0];
+    return bibleText && bibleAudio
+        ? {
+            ...bibleText,
+            ...bibleAudio,
+            language,
+            script,
+            availableTextChapters: (0, bibleChapterUtils_1.getAvailableChapters)(bibleText.bibleTextId, 'text'),
+            availableAudioChapters: (0, bibleChapterUtils_1.getAvailableChapters)(bibleAudio.bibleAudioId, 'audio'),
+            bookNames: bibleStatuses_1.bibleStatuses[bibleText.bibleTextId]?.bookNames || {},
+            fullCopyright: (bibleText.copyright ?? '') + '\n\n' + (bibleAudio.copyright ?? ''),
+        }
+        : undefined;
+}
 function getLanguageInfo(languageId, options) {
     const defaultReturn = {
         ...languages_1.languages[0],
@@ -34,24 +55,14 @@ function getLanguageInfo(languageId, options) {
             ...bibleAudios_1.bibleAudios[0],
             availableTextChapters: [],
             availableAudioChapters: [],
-            availableTimingsChapters: [],
             language: languages_1.languages[0],
             fullCopyright: '',
             bookNames: {},
             script: scripts_1.scripts[0],
         },
-        bibleFallbacks: [],
-        contentLanguages: {
-            ftbs: 'eng',
-            intros: 'eng',
-            titles: 'eng',
-            trainingVideos: 'eng',
-            questionAudio: 'eng',
-            questionText: 'eng',
-        },
+        bibleFallback: undefined,
+        trainingVideoLanguage: '',
         script: scripts_1.scripts[0],
-        lessonPauses: lessonPauses_1.lessonPauses,
-        allBibleIds: [],
     };
     const language = languages_1.languages.find((language) => language.languageId === languageId);
     if (!language) {
@@ -66,45 +77,34 @@ function getLanguageInfo(languageId, options) {
     const questionsCurriculum = curriculumQuestions_1.curriculumQuestions.find((questionCurriculum) => questionCurriculum.curriculumId === language.curriculum.questions);
     const foundationsCurriculum = curriculumFoundations_1.curriculumFoundations.find((foundationsCurriculum) => foundationsCurriculum.curriculumId === language.curriculum.foundations);
     const topicsCurriculum = curriculumTopics_1.curriculumTopics.find((topicsCurriculum) => topicsCurriculum.curriculumId === language?.curriculum.topics);
-    const setIds = [];
+    let setIds = [];
     if (foundationsCurriculum)
         setIds.push(...foundationsCurriculum.sets);
     if (topicsCurriculum)
         setIds.push(...topicsCurriculum.sets);
-    if (language.status.trainingVideos === 'launched' ||
-        language.status.trainingVideos === 'testing' ||
-        language.bridgeLanguages?.trainingVideos ||
-        (language.status.trainingVideos === 'inProgress' &&
+    if (language.dmCourseStatus === 'launched' ||
+        language.dmCourseStatus === 'testing' ||
+        language.videoBridgeLanguage ||
+        (language.dmCourseStatus === 'inProgress' &&
             options?.includeInProgressDmcSets))
         setIds.push(specialIds_1.specialIds.dmCourseSetId);
-    if (language.status.gdmc === 'launched' ||
-        language.status.gdmc === 'testing' ||
-        (language.status.gdmc === 'inProgress' && options?.includeInProgressDmcSets)) {
+    if (language.gdmcStatus === 'launched' ||
+        language.gdmcStatus === 'testing' ||
+        (language.gdmcStatus === 'inProgress' && options?.includeInProgressDmcSets)) {
         for (const gdmcSetId of specialIds_1.specialIds.growingAsDmcSetIds) {
             setIds.push(gdmcSetId);
         }
     }
+    if (language.unsupportedDbsSets)
+        setIds = setIds.filter((set) => !language.unsupportedDbsSets?.includes(set));
     const toReturn = {
         ...language,
         setIds: setIds,
         questionSets: questionsCurriculum?.questionSets ?? defaultReturn.questionSets,
-        bible: language.bible
-            ? (0, bibles_1.getBibleInfo)(language.bible) || defaultReturn.bible
-            : defaultReturn.bible,
-        bibleFallbacks: (language.bibleFallbacks ?? [])
-            .map(bibles_1.getBibleInfo)
-            .filter((b) => b != null),
-        contentLanguages: {
-            trainingVideos: language.bridgeLanguages?.trainingVideos ?? language.languageId,
-            ftbs: language.bridgeLanguages?.ftbs ?? language.languageId,
-            intros: language.bridgeLanguages?.intros ?? language.languageId,
-            titles: language.bridgeLanguages?.titles ?? language.languageId,
-            questionAudio: language.bridgeLanguages?.questionAudio ?? language.languageId,
-            questionText: language.bridgeLanguages?.questionText ?? language.languageId,
-        },
+        bible: getBibleInfo(language.bible) || defaultReturn.bible,
+        bibleFallback: getBibleInfo(language.bibleFallback),
+        trainingVideoLanguage: language.videoBridgeLanguage ?? language.languageId,
         script,
-        lessonPauses: lessonPauses_1.lessonPauses,
-        allBibleIds: (0, bibles_1.getAllBibleIds)(language),
     };
     return toReturn;
 }
@@ -130,8 +130,8 @@ function getInitialAppInterfaceLanguage(userPhoneLanguages) {
 }
 function isLanguageAvailable(status, isDev) {
     return process.env.EXPO_PUBLIC_APP_ENV === 'language-testing' || isDev
-        ? status.dbs === 'launched' || status.dbs === 'testing'
-        : status.dbs === 'launched';
+        ? status === 'launched' || status === 'testing'
+        : status === 'launched';
 }
 const superscriptToRegular = {
     '⁰': '0',
@@ -145,9 +145,9 @@ const superscriptToRegular = {
     '⁸': '8',
     '⁹': '9',
 };
-function numerals(text, scriptName) {
-    if (scriptName in numeralMaps_1.numeralMaps) {
-        const map = numeralMaps_1.numeralMaps[scriptName];
+function numerals(text, script) {
+    if (script in numeralMaps_1.numeralMaps) {
+        const map = numeralMaps_1.numeralMaps[script];
         if (!map)
             return text;
         return text
@@ -167,18 +167,20 @@ function numerals(text, scriptName) {
  * the font which can be found by inspecting the font in an app like Font Book.
  */
 function getAppTranslations(appLanguageId) {
-    return translationsApp_1.translationsApp[appLanguageId] ?? translationsApp_1.translationsApp.eng;
+    return (translationsApp_1.translationsApp[appLanguageId ?? 'eng'] ??
+        translationsApp_1.translationsApp.eng);
 }
 function getMeetTranslations(meetLanguageInfo) {
     return {
-        sets: translationsSet_1.translationsSet[meetLanguageInfo.contentLanguages.titles] ??
+        sets: translationsSet_1.translationsSet[meetLanguageInfo.titles ?? meetLanguageInfo.languageId] ??
             translationsSet_1.translationsSet.eng,
-        ftbs: translationsFtb_1.translationsFtb[meetLanguageInfo.contentLanguages.ftbs] ??
-            translationsFtb_1.translationsFtb.eng,
-        introductions: translationsIntroduction_1.translationsIntroduction[meetLanguageInfo.contentLanguages.intros] ??
-            translationsIntroduction_1.translationsIntroduction.eng,
-        questions: translationsQuestion_1.translationsQuestion[meetLanguageInfo.contentLanguages.questionText] ??
+        questions: translationsQuestion_1.translationsQuestion[meetLanguageInfo.languageId] ??
             translationsQuestion_1.translationsQuestion.eng,
-        questionsSpoken: translationsSpokenQuestion_1.translationsSpokenQuestion[meetLanguageInfo.contentLanguages.questionText] ?? translationsSpokenQuestion_1.translationsSpokenQuestion.eng,
+        questionsSpoken: translationsSpokenQuestion_1.translationsSpokenQuestion[meetLanguageInfo.languageId] ??
+            translationsSpokenQuestion_1.translationsSpokenQuestion.eng,
+        ftbs: translationsFtb_1.translationsFtb[meetLanguageInfo.languageId] ?? translationsFtb_1.translationsFtb.eng,
+        introductions: translationsIntroduction_1.translationsIntroduction[meetLanguageInfo.introBridge ??
+            meetLanguageInfo.titles ??
+            meetLanguageInfo.languageId] ?? translationsIntroduction_1.translationsIntroduction.eng,
     };
 }

package/dist/functions/scripturePassages.d.ts

@@ -1,14 +1,29 @@
-import { BibleChapter } from '../types/bibleChapters';
+import { LessonPauses } from '../data/lessonPauses/lessonPauses.zod';
+import { BibleChapter, BibleChapters } from '../types/bibleChapters';
+import type { LanguageInfo } from '../types/languages';
 import { ScripturePassage } from '../types/scripturePassages';
-import { DbsInfo, EnrichedSection, LessonInfo, Section, VideoInfo } from '../types/sets';
-export { parseVerseRange } from './bibleBooks';
-export type { VerseRangeInfo } from './bibleBooks';
+import { DbsInfo, VideoInfo } from '../types/sets';
+export interface VerseRangeInfo {
+    startBook: string;
+    startChapter: string;
+    startVerse: string;
+    endBook: string;
+    endChapter: string;
+    endVerse: string;
+    startChapterId: string;
+    endChapterId: string;
+}
+/**
+ * Parses a verse range string like "GEN.1.1-GEN.1.25" or "JHN.3.16" or "REV.22"
+ * Returns the start and end verse IDs
+ */
+export declare function parseVerseRange(passageId: string): VerseRangeInfo;
 type GetChapterUrlParams = {
     bibleAudioId: string;
     passageId: string;
 } | {
-    book: string;
-    chapter: string;
+    startBook: string;
+    startChapter: string;
     bibleAudioId: string;
 };
 export declare function getChapterUrl(params: GetChapterUrlParams): string;
@@ -21,10 +36,7 @@ export declare function getChapterUrl(params: GetChapterUrlParams): string;
  *   ["GEN.1.1-GEN.1.25", "GEN.2.4-GEN.2.7", "EXO.3.3-EXO.3.25"] -> "Genesis 1: 1-25, 2: 4-7, Exodus 3: 3-25"
  *   ["JHN.1.1"] -> "John 1: 1"
  */
-export declare function getPassagesString(passages: Array<{
-    passageId: string;
-    bibleId: string;
-}>): string;
+export declare function getPassagesString(passageIds: string[] | undefined, language: LanguageInfo): string;
 export interface GetChapterParams {
     chapterId: string;
     bibleId: string;
@@ -32,18 +44,26 @@ export interface GetChapterParams {
 export type GetChapter = (params: GetChapterParams) => Promise<BibleChapter | undefined>;
 interface GetScripturePassageParams {
     bibleId: string;
+    bibleFallbackId: string | undefined;
     passageId: string;
     getChapter: GetChapter;
-    noTextAvailableString: string;
+    languageInfo: LanguageInfo;
 }
 /** Gets a scripture passage by extracting verses from chapters documents. */
-export declare function getScripturePassage({ bibleId, passageId, getChapter, noTextAvailableString, }: GetScripturePassageParams): Promise<ScripturePassage>;
-/** Gets all scripture passages for a lesson. */
-export declare function getLessonScripture({ getChapter, lessonInfo, noTextAvailableString, }: {
-    lessonInfo: LessonInfo;
+export declare function getScripturePassage({ bibleId, bibleFallbackId, passageId, getChapter, languageInfo, }: GetScripturePassageParams): Promise<ScripturePassage | undefined>;
+interface GetLessonScriptureParams {
+    bibleId: string;
+    bibleFallbackId: string | undefined;
+    passageIds: string[];
     getChapter: (params: GetChapterParams) => Promise<BibleChapter | undefined>;
-    noTextAvailableString: string;
-}): Promise<Array<ScripturePassage>>;
+    languageInfo: LanguageInfo;
+}
+/**
+ * Gets multiple scripture passages efficiently (Future optimization: could
+ * batch the chapter fetches)
+ */
+export declare function getLessonScripture(params: GetLessonScriptureParams): Promise<Array<ScripturePassage | undefined>>;
+export declare function parseBibleSnapshot(snapshot: any, bible: string): BibleChapters;
 /**
  * Converts a verse number to a superscript string. This is useful for
  * displaying verse numbers in a more visually appealing way. For example, "1"
@@ -53,23 +73,18 @@ export declare function getLessonScripture({ getChapter, lessonInfo, noTextAvail
  * @returns The superscript string representation of the verse number.
  */
 export declare function verseToSuperscript(num: string | undefined): string;
+/** Returns the correct lesson pauses for a given language. */
+export declare function getLessonPauses(languageId: string): LessonPauses;
 /**
- * Returns the FTB audio duration + afterFtb pause for a section, or 0 if the
- * section has no FTB.
- */
-export declare function getFtbDuration(section: Section, lessonInfo: DbsInfo | VideoInfo): number;
-/**
- * Fills in `length` (for verse-timed story sections) and `startTime` (for all
- * sections) by accumulating forward through the lesson. After this, every
- * section has both fields set.
- */
-export declare function enrichSections(lessonInfo: DbsInfo | VideoInfo, scripture: Array<ScripturePassage>): EnrichedSection[];
-/**
- * Converts verse timings from chapter-relative to lesson-relative using each
- * section's `startTime` (set by {@link enrichSections}).
+ * Converts verse timings within each scripture passage from chapter-relative to
+ * full-lesson relative. This includes accounting for question durations,
+ * pauses, and from-the-book durations.
+ *
+ * Multi-chapter passages are split into per-chapter chunks internally, since
+ * the audio is clipped from individual chapter files.
  */
-export declare function normalizeVerseTimings({ enrichedSections, scripture, lessonInfo, }: {
-    enrichedSections: EnrichedSection[];
-    scripture: Array<ScripturePassage>;
+export declare function normalizeVerseTimings({ lessonInfo, scripture, }: {
+    scripture: Array<ScripturePassage | undefined>;
     lessonInfo: DbsInfo | VideoInfo;
-}): Array<ScripturePassage>;
+}): Array<ScripturePassage | undefined>;
+export {};