waha-shared 1.0.308 → 1.0.310

package/dist/functions/sets.js

@@ -1,22 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firebaseUrl = void 0;
 exports.getSetInfo = getSetInfo;
 exports.getLessonInfo = getLessonInfo;
 exports.convertSToString = convertSToString;
 exports.shouldShowLesson = shouldShowLesson;
-exports.calculateSectionTimings = calculateSectionTimings;
-exports.getSupportsVerseHighlight = getSupportsVerseHighlight;
-const languageAssets_1 = require("../data/languageAssets");
+exports.getExpectedLessonDuration = getExpectedLessonDuration;
+const bibleStatuses_1 = require("../data/bibleStatuses");
 const mediaDurations_1 = require("../data/mediaDurations");
-const questions_1 = require("../data/questions");
 const sets_1 = require("../data/sets");
 const specialIds_1 = require("../data/specialIds");
 const youtubeVideos_1 = require("../data/youtubeVideos");
 const scripturePassages_1 = require("../functions/scripturePassages");
 const sets_2 = require("../types/sets");
-exports.firebaseUrl = 'https://firebasestorage.googleapis.com/v0/b/waha-app-db.appspot.com/o/';
-function getSetInfo({ setId, meetLanguageId, setIds, t, }) {
+const bibles_1 = require("./bibles");
+const utils_1 = require("./utils");
+function getSetInfo({ setId, languageId, setIds, t, }) {
     const idComponents = setId.split('.');
     const category = idComponents[0] === '01'
         ? 'Foundations'
@@ -30,7 +28,7 @@ function getSetInfo({ setId, meetLanguageId, setIds, t, }) {
     const thisSet = sets_1.sets.find((set) => set.setId === setId);
     if (!thisSet)
         return;
-    if (meetLanguageId === 'ase') {
+    if (languageId === 'ase') {
         const englishEquivalent = sets_1.sets.find((set) => set.name === thisSet.name && !set.comment);
         thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === englishEquivalent?.setId);
     }
@@ -48,26 +46,26 @@ function getSetInfo({ setId, meetLanguageId, setIds, t, }) {
         setSubtitle: category === 'Topics'
             ? (thisSetTranslations?.setTag ?? '')
             : `${categoryName} ${parseInt(setNumber)}`,
-        setLink: `https://web.waha.app/set?set-id=${setId}&meet-language=${meetLanguageId}`,
-        meetLanguageId,
+        setLink: `https://web.waha.app/set?set-id=${setId}&meet-language=${languageId}`,
+        languageId,
         setNumber,
         category,
     };
     return toReturn;
 }
-function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuestions, }) {
+function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions, }) {
     if (!lessonId)
         return;
     else if (lessonId.split('.').length !== 3)
         return;
     const [category, setNumber, lessonNumber] = lessonId.split('.');
-    const meetLanguageId = meetLanguageInfo.languageId;
+    const languageId = languageInfo.languageId;
     setInfo =
         setInfo ??
             getSetInfo({
                 setId: [category, setNumber].join('.'),
-                meetLanguageId,
-                setIds: meetLanguageInfo.setIds,
+                languageId,
+                setIds: languageInfo.setIds,
                 t,
             });
     if (!setInfo) {
@@ -79,7 +77,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         return;
     let thisSetTranslations;
     let lessonTitle;
-    if (meetLanguageId === 'ase') {
+    if (languageId === 'ase') {
         const englishEquivalent = sets_1.sets.find((set) => set.name === setInfo.name && !set.comment);
         thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === englishEquivalent?.setId);
         lessonTitle =
@@ -89,171 +87,233 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         thisSetTranslations = t.sets.find((setTranslations) => setTranslations.setId === setInfo?.setId);
         lessonTitle = thisSetTranslations?.lessonTitles?.[lessonId];
     }
-    const fellowshipQuestions = meetLanguageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.f)?.questions ?? [];
+    const fellowshipQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.f)?.questions ?? [];
     const fellowshipQuestionsText = fellowshipQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
-    const applicationQuestions = meetLanguageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.a)?.questions ?? [];
+    const applicationQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.a)?.questions ?? [];
     const applicationQuestionsText = applicationQuestions.map((questionId) => useSpokenQuestions ? t.questionsSpoken[questionId] : t.questions[questionId]);
     const sections = [
         {
             id: 'title',
-            isChapter: false,
-            header: lessonTitle ?? '',
             index: 0,
-            chapter: null,
             indexWithinChapter: 0,
-            text: lessonTitle ?? '',
-            hasBeep: false,
+            fileName: '',
+            languageId,
         },
     ];
     fellowshipQuestions.forEach((questionId, index) => {
-        const hasBeep = questions_1.questions.find((question) => question.questionId === questionId)
-            ?.hasBeep ?? false;
+        const fileName = `${languageInfo.contentLanguages.questionAudio}.${questionId}.mp3`;
         sections.push({
             id: questionId,
-            isChapter: index === 0,
+            languageId: languageInfo.contentLanguages.questionAudio,
             index: sections.length,
-            header: index === 0 ? t.fellowship : null,
+            header: index === 0 ? t.fellowship : undefined,
             chapter: sets_2.Chapter.FELLOWSHIP,
             indexWithinChapter: index,
             text: fellowshipQuestionsText[index],
-            hasBeep,
+            fileName,
         });
     });
-    let introLength = undefined;
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
         sections.push({
             id: 'eq',
-            isChapter: false,
+            languageId: languageInfo.contentLanguages.intros,
             index: sections.length,
             chapter: sets_2.Chapter.INTRODUCTION,
             indexWithinChapter: 0,
-            header: null,
+            pauseBefore: 0,
             text: t.introductions.introductions.eq,
-            hasBeep: false,
+            fileName: `${languageInfo.contentLanguages.intros}.eq.mp3`,
         });
     }
     else if (specialIds_1.specialIds.growingAsDmcSetIds.includes(setInfo.setId)) {
+        const introFileName = [
+            languageInfo.contentLanguages.intros,
+            lessonId,
+            'intro',
+            'mp3',
+        ].join('.');
         sections.push({
             id: 'introduction',
-            isChapter: false,
+            languageId: languageInfo.contentLanguages.intros,
             index: sections.length,
             chapter: sets_2.Chapter.INTRODUCTION,
             indexWithinChapter: 0,
+            pauseBefore: languageInfo.lessonPauses.beforeFtb,
             header: t.introductions.introduction,
             text: t.introductions.introductions[lessonId],
-            hasBeep: false,
+            fileName: introFileName,
         });
-        const introLanguageId = meetLanguageInfo.introBridge ?? meetLanguageId;
-        introLength =
-            mediaDurations_1.mediaDurations[introLanguageId]?.[`${introLanguageId}.${lessonId}.mp3`];
     }
-    lesson.s?.forEach((passageId, index) => {
+    let lastBook = null;
+    lesson.s.forEach((passageId, index) => {
+        const bibleId = (0, bibles_1.getBibleForPassage)({
+            languageInfo,
+            lessonCategory: setInfo.category,
+            passageId,
+        });
+        const passageInfo = (0, scripturePassages_1.parseVerseRange)(passageId);
+        const ftbRequired = lastBook !== passageInfo.book;
         sections.push({
-            id: passageId,
-            isChapter: index === 0,
-            hasBeep: false,
+            id: `${bibleId};${passageId}`,
+            languageId,
             index: sections.length,
             chapter: sets_2.Chapter.STORY,
             indexWithinChapter: index,
-            text: '',
-            header: (0, scripturePassages_1.getPassagesString)([passageId], meetLanguageInfo),
+            pauseBefore: ftbRequired
+                ? languageInfo.lessonPauses.beforeFtb
+                : languageInfo.lessonPauses.betweenPassages,
+            ftbFileName: ftbRequired
+                ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
+                : undefined,
+            fileName: bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
+                ? passageId + '.mp3'
+                : passageInfo.chapterAudioFileName,
+            header: (0, scripturePassages_1.getPassagesString)([{ bibleId, passageId }]),
+        });
+        lastBook = passageInfo.book;
+    });
+    const passagesString = (0, scripturePassages_1.getPassagesString)(sections
+        .filter((section) => section.chapter === sets_2.Chapter.STORY)
+        .map((section) => {
+        const [bibleId, passageId] = section.id.split(';');
+        return { passageId, bibleId };
+    }));
+    let concatStoryIndex = lesson.s.length;
+    languageInfo.bibleModifiers?.forEach((modifier) => {
+        lesson.s.forEach((passageId) => {
+            if (!(0, bibles_1.shouldConcatBibleWith)({
+                modifier,
+                lessonCategory: setInfo.category,
+                passageId,
+            }))
+                return;
+            const passageInfo = (0, scripturePassages_1.parseVerseRange)(passageId);
+            const ftbRequired = lastBook !== passageInfo.book;
+            sections.push({
+                id: `${modifier.bibleId};${passageId}`,
+                languageId,
+                index: sections.length,
+                chapter: sets_2.Chapter.STORY,
+                indexWithinChapter: concatStoryIndex,
+                fileName: passageInfo.chapterAudioFileName,
+                pauseBefore: ftbRequired
+                    ? languageInfo.lessonPauses.beforeFtb
+                    : languageInfo.lessonPauses.betweenPassages,
+                ftbFileName: ftbRequired
+                    ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
+                    : undefined,
+                header: (0, scripturePassages_1.getPassagesString)([{ bibleId: modifier.bibleId, passageId }]),
+            });
+            lastBook = passageInfo.book;
+            concatStoryIndex++;
         });
     });
     applicationQuestions.forEach((questionId, index) => {
-        const hasBeep = questions_1.questions.find((question) => question.questionId === questionId)
-            ?.hasBeep ?? false;
+        const fileName = questionId.includes('video')
+            ? `${languageInfo.contentLanguages.trainingVideos}.${lessonId}.mp4`
+            : `${languageInfo.contentLanguages.questionAudio}.${questionId}.mp3`;
         sections.push({
             id: questionId,
-            isChapter: index === 0,
-            hasBeep,
+            languageId: questionId.includes('video')
+                ? languageInfo.contentLanguages.trainingVideos
+                : languageInfo.contentLanguages.questionAudio,
             index: sections.length,
             chapter: sets_2.Chapter.APPLICATION,
             indexWithinChapter: index,
-            header: index === 0 ? t.application : null,
+            pauseBefore: index === 0 ? languageInfo.lessonPauses.afterStory : undefined,
+            header: index === 0 ? t.application : undefined,
             text: questionId.includes('video')
                 ? t.training_video
                 : applicationQuestionsText[index],
+            fileName,
         });
     });
     const baseInfo = {
-        lessonLink: `https://web.waha.app/lesson?lesson-id=${lessonId}&meet-language=${meetLanguageId}`,
+        lessonLink: `https://web.waha.app/lesson?lesson-id=${lessonId}&meet-language=${languageId}`,
         lessonNumber,
         lessonTitle,
         sections,
         ...setInfo,
         ...lesson,
+        ...languageInfo,
     };
-    const fellowshipDuration = fellowshipQuestions.reduce((sum, questionId) => {
-        const key = `${meetLanguageId}.${questionId}.mp3`;
-        return sum + (mediaDurations_1.mediaDurations[meetLanguageId]?.[key] ?? 0);
-    }, 0);
-    let applicationDuration = applicationQuestions.reduce((sum, questionId) => {
-        return (sum +
-            (mediaDurations_1.mediaDurations[meetLanguageId]?.[`${meetLanguageId}.${questionId}.mp3`] ??
-                0));
-    }, 0);
+    const fellowshipDuration = sections
+        .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
+        .reduce((sum, section) => sum +
+        (section.pauseBefore ?? 0) +
+        (mediaDurations_1.mediaDurations[languageInfo.contentLanguages.questionAudio]?.[section.fileName] ?? 0), 0);
+    let applicationDuration = sections
+        .filter((s) => s.chapter === sets_2.Chapter.APPLICATION)
+        .reduce((sum, section) => sum +
+        (section.pauseBefore ?? 0) +
+        (mediaDurations_1.mediaDurations[languageInfo.contentLanguages.questionAudio]?.[section.fileName] ?? 0), 0);
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
-        const languageId = meetLanguageInfo.introBridge ?? meetLanguageId;
-        const id = `${languageId}.eq`;
-        const fileName = `${id}.mp3`;
-        const path = `${languageId}/introductions/${fileName}`;
+        const eqId = `${languageInfo.contentLanguages.intros}.eq`;
+        const eqFileName = `${eqId}.mp3`;
+        const eqPath = (0, utils_1.join)(languageInfo.contentLanguages.intros, 'introductions', eqFileName);
         return {
             type: 'eq',
             ...baseInfo,
             fellowshipDuration,
             applicationDuration,
             eq: {
-                id,
-                languageId,
-                localFileName: fileName,
-                remoteFileName: fileName,
-                path,
-                url: exports.firebaseUrl + encodeURIComponent(path) + `?alt=media`,
+                id: eqId,
+                localFileName: eqFileName,
+                remoteFileName: eqFileName,
+                path: eqPath,
+                url: (0, utils_1.firebasePath)(eqPath),
             },
         };
     }
     else if (setInfo.setId === specialIds_1.specialIds.dmCourseSetId ||
-        meetLanguageId === 'ase') {
+        languageId === 'ase') {
         let video;
         let trainingVideo;
-        if (meetLanguageInfo.languageId === 'ase') {
-            const path = `ase/full_lessons/${setInfo.setId}/ase.${lessonId}.1080.mp4`;
+        if (languageId === 'ase') {
+            const aseVideoLessonId = `${languageId}.${lessonId}`;
+            const aseVideoLocalFileName = `${aseVideoLessonId}.mp4`;
+            const aseVideoRemoteFileName = `${aseVideoLessonId}.1080.mp4`;
+            const aseVideoPath = (0, utils_1.join)(languageId, 'full_lessons', setInfo.setId, aseVideoRemoteFileName);
             video = {
-                id: `ase.${lessonId}`,
-                languageId: 'ase',
-                path,
-                localFileName: `ase.${lessonId}.mp4`,
-                remoteFileName: `ase.${lessonId}.1080.mp4`,
-                url: exports.firebaseUrl + encodeURIComponent(path) + `?alt=media`,
+                id: aseVideoLessonId,
+                localFileName: aseVideoLocalFileName,
+                remoteFileName: aseVideoRemoteFileName,
+                path: aseVideoPath,
+                url: (0, utils_1.firebasePath)(aseVideoPath),
             };
             trainingVideo = undefined;
         }
         else {
-            const id = `${meetLanguageId}.${meetLanguageInfo.trainingVideoLanguage}.${lessonId}`;
-            const remoteFileName = `${id}.1080.mp4`;
-            const localFileName = `${id}.mp4`;
-            const path = `${meetLanguageId}/full_lessons/${setInfo?.setId}/${remoteFileName}`;
+            const videoLessonId = [
+                languageId,
+                languageInfo.contentLanguages.trainingVideos,
+                lessonId,
+            ].join('.');
+            const videoLessonRemoteFileName = `${videoLessonId}.1080.mp4`;
+            const videoLessonLocalFileName = `${videoLessonId}.mp4`;
+            const videoPath = (0, utils_1.join)(languageId, 'full_lessons', setInfo.setId, videoLessonRemoteFileName);
             video = {
-                id,
-                languageId: meetLanguageInfo.trainingVideoLanguage,
-                path,
-                localFileName,
-                remoteFileName,
-                url: exports.firebaseUrl + encodeURIComponent(path) + `?alt=media`,
+                id: videoLessonId,
+                localFileName: videoLessonLocalFileName,
+                remoteFileName: videoLessonRemoteFileName,
+                path: videoPath,
+                url: (0, utils_1.firebasePath)(videoPath),
             };
-            const trainingVideoId = `${meetLanguageInfo.trainingVideoLanguage}.${lessonId}`;
+            const trainingVideoId = [
+                languageInfo.contentLanguages.trainingVideos,
+                lessonId,
+            ].join('.');
             const trainingVideoFileName = `${trainingVideoId}.mp4`;
             // Add the length of the training video to the application duration.
             applicationDuration +=
-                mediaDurations_1.mediaDurations[meetLanguageInfo.trainingVideoLanguage]?.[trainingVideoFileName] ?? 0;
-            const trainingVideoPath = `${meetLanguageInfo.trainingVideoLanguage}/course/videos_compressed/${trainingVideoFileName}`;
+                mediaDurations_1.mediaDurations[languageInfo.contentLanguages.trainingVideos]?.[trainingVideoFileName] ?? 0;
+            const trainingVideoPath = (0, utils_1.join)(languageInfo.contentLanguages.trainingVideos, 'course', 'videos_compressed', trainingVideoFileName);
             trainingVideo = {
                 id: trainingVideoId,
-                languageId: meetLanguageInfo.trainingVideoLanguage,
-                path: trainingVideoPath,
                 localFileName: trainingVideoFileName,
-                remoteFileName,
-                url: exports.firebaseUrl + encodeURIComponent(trainingVideoPath) + `?alt=media`,
+                remoteFileName: trainingVideoFileName,
+                path: trainingVideoPath,
+                url: (0, utils_1.firebasePath)(trainingVideoPath),
             };
         }
         let youtubeLink;
@@ -271,33 +331,41 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
             video,
             trainingVideo,
             youtubeLink,
-            passagesString: (0, scripturePassages_1.getPassagesString)(lesson.s, meetLanguageInfo),
+            passagesString,
         };
     }
     else {
+        const assetVersion = languageInfo.audioAssetVersion ?? '';
+        const fullLessonId = `${languageId}.${lessonId}`;
+        const fullLessonFileName = `${fullLessonId}.mp3`;
+        const fullLessonPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, fullLessonFileName);
+        const storyId = fullLessonId + '.story';
+        const storyFileName = `${storyId}.mp3`;
+        const storyPath = (0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, storyFileName);
         return {
             type: 'dbs',
             ...baseInfo,
             fellowshipDuration,
             applicationDuration,
-            introLength,
+            passagesString,
             full: {
-                id: `${meetLanguageId}.${lessonId}`,
-                localFileName: `${meetLanguageId}.${lessonId}.mp3`,
-                remoteFileName: `${meetLanguageId}.${lessonId}.mp3`,
-                languageId: meetLanguageId,
-                path: `${meetLanguageId}/full_lessons${meetLanguageInfo.audioAssetVersion ?? ''}/${setInfo.setId}/${meetLanguageId}.${lessonId}.mp3`,
-                url: exports.firebaseUrl +
-                    encodeURIComponent(`${meetLanguageId}/full_lessons${meetLanguageInfo.audioAssetVersion ?? ''}/${setInfo.setId}/${meetLanguageId}.${lessonId}.mp3`) +
-                    `?alt=media`,
+                id: fullLessonId,
+                localFileName: fullLessonFileName,
+                remoteFileName: fullLessonFileName,
+                path: fullLessonPath,
+                url: (0, utils_1.firebasePath)(fullLessonPath),
+            },
+            story: {
+                id: storyId,
+                localFileName: storyFileName,
+                remoteFileName: storyFileName,
+                path: storyPath,
+                url: (0, utils_1.firebasePath)(storyPath),
             },
             dbsCast: {
-                remoteFileName: `${meetLanguageId}.${lessonId}.1080.mp4`,
-                url: exports.firebaseUrl +
-                    encodeURIComponent(`${meetLanguageId}/full_lessons/${setInfo.setId}/${meetLanguageId}.${lessonId}.1080.mp4`) +
-                    `?alt=media`,
+                remoteFileName: `${languageId}.${lessonId}.1080.mp4`,
+                url: (0, utils_1.firebasePath)((0, utils_1.join)(languageId, `full_lessons${assetVersion}`, setInfo.setId, `${languageId}.${lessonId}.1080.mp4`)),
             },
-            passagesString: (0, scripturePassages_1.getPassagesString)(lesson.s, meetLanguageInfo),
         };
     }
 }
@@ -348,18 +416,20 @@ function shouldShowLesson(lessonInfo, languageInfo) {
         return false;
     }
     else if (lessonInfo.type === 'eq' &&
-        !languageAssets_1.languageAssets[languageInfo.introBridge ?? languageInfo.languageId].find((f) => f === lessonInfo.eq.remoteFileName)) {
+        mediaDurations_1.mediaDurations[languageInfo.contentLanguages.intros]?.[lessonInfo.eq.remoteFileName] === undefined) {
         console.log('Missing remote eq file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'dbs' &&
-        !languageAssets_1.languageAssets[lessonInfo.meetLanguageId].find((f) => f === lessonInfo.full.remoteFileName)) {
+        mediaDurations_1.mediaDurations[lessonInfo.languageId]?.[lessonInfo.full.remoteFileName] ===
+            undefined) {
         console.log('Missing remote dbs file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'video' &&
         lessonInfo.video &&
-        !languageAssets_1.languageAssets[lessonInfo.meetLanguageId].find((f) => f === lessonInfo.video.remoteFileName)) {
+        mediaDurations_1.mediaDurations[lessonInfo.languageId]?.[lessonInfo.video.remoteFileName] ===
+            undefined) {
         console.log('Missing remote video for lesson:', lessonInfo.video.remoteFileName);
         return false;
     }
@@ -367,101 +437,21 @@ function shouldShowLesson(lessonInfo, languageInfo) {
         return true;
 }
 /**
- * Calculate start times for each section based on question durations and total
- * audio duration. Must be called after audio is loaded to get accurate total
- * duration.
+ * Validates that the computed lesson duration (from section lengths) matches
+ * the actual audio file duration. Sections must be enriched (all have `length`)
+ * via {@link enrichSections} before calling this.
+ *
+ * @returns The difference between the computed length and the total duration.
  */
-function calculateSectionTimings({ languageInfo, thisLesson, totalDuration, normalizedScripture, supportsVerseHighlight, }) {
-    const languageDurations = mediaDurations_1.mediaDurations[languageInfo.languageId];
-    const pauses = (0, scripturePassages_1.getLessonPauses)(thisLesson.meetLanguageId);
-    const getQuestionDuration = (questionId) => {
-        const fileName = `${languageInfo.languageId}.${questionId}.mp3`;
-        return languageDurations?.[fileName] ?? 0;
-    };
-    const timings = new Map();
-    // Title section always starts at 0
-    timings.set('title', 0);
-    // Calculate fellowship question timings from the start
-    let currentTime = 0;
-    /** Add timings for each fellowship question. */
-    thisLesson.sections
-        .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
-        .forEach((section) => {
-        timings.set(section.id, currentTime);
-        currentTime += getQuestionDuration(section.id);
-    });
-    /** Add the pause before the story chapter starts. */
-    currentTime += pauses.beforeStory;
-    /** Add the intro timing and pause if we have one. */
-    const introSection = thisLesson.sections.find((s) => s.chapter === sets_2.Chapter.INTRODUCTION);
-    if (introSection && thisLesson.type === 'dbs' && thisLesson.introLength) {
-        timings.set(introSection.id, currentTime);
-        currentTime += thisLesson.introLength;
-    }
-    const storySections = thisLesson.sections.filter((s) => s.chapter === sets_2.Chapter.STORY);
-    if (storySections.length > 0) {
-        /** First passage will always start right after all previous sections. */
-        timings.set(storySections[0].id, currentTime);
-        /** Subsequent passages require normalized scripture data to get timings for. */
-        if (storySections.length > 1 && supportsVerseHighlight)
-            storySections.slice(1).forEach((section) => {
-                const passageStartTime = normalizedScripture[section.indexWithinChapter]?.verses?.[0]
-                    ?.timings?.[0];
-                if (passageStartTime != null)
-                    timings.set(section.id, passageStartTime);
-            });
-    }
-    /**
-     * Application section starts after story ends, but we can work backwards and
-     * calculate its start time by subtracting its duration from the total
-     * duration. This way, if we don't have verse timings data, we can still have
-     * timings for the application section.
-     */
-    const applicationStartTime = totalDuration - thisLesson.applicationDuration;
-    currentTime = applicationStartTime;
-    thisLesson.sections
-        .filter((s) => s.chapter === sets_2.Chapter.APPLICATION)
-        .forEach((section) => {
-        timings.set(section.id, currentTime);
-        if (section.id.includes('video') &&
-            thisLesson.type === 'video' &&
-            thisLesson.trainingVideo)
-            currentTime +=
-                mediaDurations_1.mediaDurations[thisLesson.trainingVideo.languageId]?.[thisLesson.trainingVideo.localFileName] ?? 0;
-        else
-            currentTime += getQuestionDuration(section.id);
-    });
-    return timings;
-}
-/**
- * Checks if pre-normalized verse timings for given scripture are valid. Does
- * this by comparing the real duration of the full lesson mp3 file with the
- * calculated duration based on individual question durations and verse timing
- * data from bible chapter documents. For lessons generated programmatically
- * with recent systems, they should be nearly identical. For older lessons that
- * were made by hand, they may be off. If they're too off, they will be flagged
- * as invalid and the lesson will default to not using verse timings.
- */
-function getSupportsVerseHighlight({ lessonInfo, scripture, totalDuration, }) {
-    if (!totalDuration)
-        return { computedLength: 0, diff: 0, passed: false };
-    let lastEnd;
-    for (const passage of scripture) {
-        if (!passage)
+function getExpectedLessonDuration({ enrichedSections, lessonInfo, }) {
+    let computedLength = 0;
+    for (const section of enrichedSections) {
+        if (!section.chapter)
             continue;
-        for (const verse of passage.verses) {
-            if (verse.timings) {
-                if (lastEnd === undefined || verse.timings[1] > lastEnd) {
-                    lastEnd = verse.timings[1];
-                }
-            }
-        }
+        computedLength += section.pauseBefore ?? 0;
+        if (section.chapter === sets_2.Chapter.STORY)
+            computedLength += (0, scripturePassages_1.getFtbDuration)(section, lessonInfo);
+        computedLength += section.length ?? 0;
     }
-    if (lastEnd === undefined)
-        return { computedLength: 0, diff: 0, passed: false };
-    const computedLength = lastEnd +
-        (0, scripturePassages_1.getLessonPauses)(lessonInfo.meetLanguageId).afterStory +
-        lessonInfo.applicationDuration;
-    const diff = Math.abs(computedLength - totalDuration);
-    return { computedLength, diff, passed: diff < 3 };
+    return computedLength;
 }

package/dist/functions/utils.d.ts

@@ -0,0 +1,2 @@
+export declare const join: (...parts: string[]) => string;
+export declare const firebasePath: (path: string) => string;

package/dist/functions/utils.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.firebasePath = exports.join = void 0;
+const firebase_1 = require("../data/firebase");
+const join = (...parts) => parts.join('/').replace(/\/+/g, '/');
+exports.join = join;
+const firebasePath = (path) => firebase_1.firebaseUrl + encodeURIComponent(path) + `?alt=media`;
+exports.firebasePath = firebasePath;

package/dist/types/bibleChapters.d.ts

@@ -9,7 +9,7 @@ export type BibleVerse = z.infer<typeof BibleVerse>;
 export declare const BibleChapter: z.ZodObject<{
     bookName: z.ZodString;
     chapterId: z.ZodString;
-    reference: z.ZodOptional<z.ZodString>;
+    reference: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     titles: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodNull]>>;
     translationId: z.ZodString;
     verses: z.ZodArray<z.ZodObject<{
@@ -23,7 +23,7 @@ export type BibleChapter = z.infer<typeof BibleChapter>;
 export declare const BibleChapters: z.ZodArray<z.ZodObject<{
     bookName: z.ZodString;
     chapterId: z.ZodString;
-    reference: z.ZodOptional<z.ZodString>;
+    reference: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     titles: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodNull]>>;
     translationId: z.ZodString;
     verses: z.ZodArray<z.ZodObject<{

package/dist/types/bibleChapters.js

@@ -18,7 +18,7 @@ exports.BibleChapter = zod_1.z
     chapterId: zod_1.z
         .string()
         .regex(new RegExp('^(GEN|EXO|LEV|NUM|DEU|JOS|JDG|RUT|1SA|2SA|1KI|2KI|1CH|2CH|EZR|NEH|EST|JOB|PSA|PRO|ECC|SNG|ISA|JER|LAM|EZK|DAN|HOS|JOL|AMO|OBA|JON|MIC|NAM|HAB|ZEP|HAG|ZEC|MAL|MAT|MRK|LUK|JHN|ACT|ROM|1CO|2CO|GAL|EPH|PHP|COL|1TH|2TH|1TI|2TI|TIT|PHM|HEB|JAS|1PE|2PE|1JN|2JN|3JN|JUD|REV)\\.[0-9]+$')),
-    reference: zod_1.z.string().optional(),
+    reference: zod_1.z.string().optional().nullable(),
     titles: zod_1.z.union([zod_1.z.record(zod_1.z.string(), zod_1.z.string()), zod_1.z.null()]).optional(),
     translationId: zod_1.z.string(),
     verses: zod_1.z.array(exports.BibleVerse).min(1),