waha-shared 1.0.307 → 1.0.309

package/dist/functions/bibles.js

@@ -32,15 +32,19 @@ function getBibleInfo(bibleId) {
         t.bibleAudioId === bibleText?.bibleTextId);
     const language = languages_1.languages.find((l) => l.languageId === bibleText?.languageId);
     const script = scripts_1.scripts.find((s) => s.name === language?.script) ?? scripts_1.scripts[0];
+    if (!bibleText || !bibleAudio || !language)
+        return;
+    const availableChapters = getAvailableChapters(bibleText.bibleTextId);
     const result = bibleText && bibleAudio && language
         ? {
             ...bibleText,
             ...bibleAudio,
             language,
             script,
-            availableTextChapters: getAvailableChapters(bibleText.bibleTextId, 'text'),
-            availableAudioChapters: getAvailableChapters(bibleAudio.bibleAudioId, 'audio'),
-            availableTimingsChapters: getAvailableChapters(bibleAudio.bibleAudioId, 'timings'),
+            availableTextChapters: availableChapters.text,
+            availableAudioChapters: availableChapters.audio,
+            availableTimingsChapters: availableChapters.timings,
+            availableChapters: availableChapters.all,
             bookNames: {
                 ...(bibleText.bookNameFallback
                     ? (bibleStatuses_1.bibleStatuses[bibleText.bookNameFallback]?.bookNames ?? {})
@@ -177,19 +181,16 @@ const bookLengths = new Map([
     ['REV', 22],
 ]);
 /**
- * Expands an optimized chapter list back to individual chapters Converts book
- * names (e.g., "GEN") back to all chapters (e.g., ["GEN.1", "GEN.2", ..."])
- * Converts testament names ("OT", "NT") back to all chapters in that testament
- * Leaves individual chapters unchanged
+ * Expands an optimized chapter list back to individual chapters for a single
+ * type. Converts book names (e.g., "GEN") back to all chapters (e.g., ["GEN.1",
+ * "GEN.2", ..."]). Converts testament names ("OT", "NT") back to all chapters
+ * in that testament. Leaves individual chapters unchanged.
  *
  * @param optimizedChapters - Array that may contain testament IDs, book IDs, or
  *   chapter IDs
  * @returns Array of individual chapter IDs in canonical order
  */
-function getAvailableChapters(bibleId, type) {
-    if (!bibleId)
-        return [];
-    const optimizedChapters = bibleStatuses_1.bibleStatuses[bibleId]?.[type] || [];
+function expandOptimizedChapters(optimizedChapters) {
     if (optimizedChapters.length === 0)
         return [];
     // Build a Set of included items for O(1) lookup
@@ -236,6 +237,28 @@ function getAvailableChapters(bibleId, type) {
     }
     return result;
 }
+/**
+ * Returns available chapters for all types (text, audio, timings) plus a
+ * combined `all` array.
+ *
+ * @param bibleId - The bible translation ID to look up
+ * @returns Object with expanded chapter arrays for each type and a combined
+ *   `all` array
+ */
+function getAvailableChapters(bibleId) {
+    const emptyReturn = { text: [], audio: [], timings: [], all: [] };
+    if (!bibleId)
+        return emptyReturn;
+    const status = bibleStatuses_1.bibleStatuses[bibleId];
+    if (!status)
+        return emptyReturn;
+    const text = expandOptimizedChapters(status.text ?? []);
+    const audio = expandOptimizedChapters(status.audio ?? []);
+    const timings = expandOptimizedChapters(status.timings ?? []);
+    const allSet = new Set([...text, ...audio, ...timings]);
+    const all = bibleChaptersList_1.bibleChaptersList.filter((c) => allSet.has(c));
+    return { text, audio, timings, all };
+}
 function getPercentage(bibleId, type) {
     const optimizedChapters = bibleStatuses_1.bibleStatuses[bibleId]?.[type] || [];
     let total = 0;

package/dist/functions/languages.js

@@ -9,6 +9,7 @@ exports.getMeetTranslations = getMeetTranslations;
 const bibleAudios_1 = require("../data/bibleAudios");
 const bibleTexts_1 = require("../data/bibleTexts");
 const curriculumFoundations_1 = require("../data/curriculumFoundations");
+const curriculumOnboarding_1 = require("../data/curriculumOnboarding");
 const curriculumQuestions_1 = require("../data/curriculumQuestions");
 const curriculumTopics_1 = require("../data/curriculumTopics");
 const languages_1 = require("../data/languages");
@@ -35,6 +36,7 @@ function getLanguageInfo(languageId, options) {
             availableTextChapters: [],
             availableAudioChapters: [],
             availableTimingsChapters: [],
+            availableChapters: [],
             language: languages_1.languages[0],
             fullCopyright: '',
             bookNames: {},
@@ -48,10 +50,12 @@ function getLanguageInfo(languageId, options) {
             trainingVideos: 'eng',
             questionAudio: 'eng',
             questionText: 'eng',
+            onboardingPassages: 'eng',
         },
         script: scripts_1.scripts[0],
         lessonPauses: lessonPauses_1.lessonPauses,
         allBibleIds: [],
+        onboardingPassageIds: curriculumOnboarding_1.curriculumOnboarding[0].passages,
     };
     const language = languages_1.languages.find((language) => language.languageId === languageId);
     if (!language) {
@@ -66,6 +70,7 @@ 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 onboardingCurriculum = curriculumOnboarding_1.curriculumOnboarding.find((onboardingCurriculum) => onboardingCurriculum.curriculumId === language.curriculum.onboarding);
     const setIds = [];
     if (foundationsCurriculum)
         setIds.push(...foundationsCurriculum.sets);
@@ -101,10 +106,12 @@ function getLanguageInfo(languageId, options) {
             titles: language.bridgeLanguages?.titles ?? language.languageId,
             questionAudio: language.bridgeLanguages?.questionAudio ?? language.languageId,
             questionText: language.bridgeLanguages?.questionText ?? language.languageId,
+            onboardingPassages: language.bridgeLanguages?.onboardingPassages ?? language.languageId,
         },
         script,
         lessonPauses: lessonPauses_1.lessonPauses,
         allBibleIds: (0, bibles_1.getAllBibleIds)(language),
+        onboardingPassageIds: onboardingCurriculum?.passages ?? defaultReturn.onboardingPassageIds,
     };
     return toReturn;
 }

package/dist/functions/scripturePassages.d.ts

@@ -28,8 +28,29 @@ export declare function getPassagesString(passages: Array<{
 export interface GetChapterParams {
     chapterId: string;
     bibleId: string;
+    noTextAvailableString: string;
 }
 export type GetChapter = (params: GetChapterParams) => Promise<BibleChapter | undefined>;
+/**
+ * Raw chapter fetcher — returns whatever the backing store has, with no
+ * placeholder synthesis or post-processing.
+ */
+export type RawChapterFetcher = (params: {
+    bibleId: string;
+    chapterId: string;
+}) => Promise<BibleChapter | undefined>;
+/**
+ * Wraps a raw chapter fetcher with placeholder logic shared across all
+ * backends:
+ *
+ * - If the chapter is not in `availableTextChapters` nor
+ *   `availableTimingsChapters`, synthesize a one-verse placeholder without
+ *   calling the underlying fetcher.
+ * - If a fetched chapter is timings-only (verses exist but none have text), patch
+ *   verse 1's text with `noTextAvailableString` so downstream consumers can
+ *   render something.
+ */
+export declare function withChapterPlaceholders(fetchRaw: RawChapterFetcher): GetChapter;
 interface GetScripturePassageParams {
     bibleId: string;
     passageId: string;
@@ -37,13 +58,13 @@ interface GetScripturePassageParams {
     noTextAvailableString: string;
 }
 /** Gets a scripture passage by extracting verses from chapters documents. */
-export declare function getScripturePassage({ bibleId, passageId, getChapter, noTextAvailableString, }: GetScripturePassageParams): Promise<ScripturePassage>;
+export declare function getScripturePassage({ bibleId, passageId, getChapter, noTextAvailableString, }: GetScripturePassageParams): Promise<ScripturePassage | undefined>;
 /** Gets all scripture passages for a lesson. */
 export declare function getLessonScripture({ getChapter, lessonInfo, noTextAvailableString, }: {
     lessonInfo: LessonInfo;
     getChapter: (params: GetChapterParams) => Promise<BibleChapter | undefined>;
     noTextAvailableString: string;
-}): Promise<Array<ScripturePassage>>;
+}): Promise<Array<ScripturePassage | undefined>>;
 /**
  * Converts a verse number to a superscript string. This is useful for
  * displaying verse numbers in a more visually appealing way. For example, "1"
@@ -63,13 +84,13 @@ export declare function getFtbDuration(section: Section, lessonInfo: DbsInfo | V
  * 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[];
+export declare function enrichSections(lessonInfo: DbsInfo | VideoInfo, scripture: Array<ScripturePassage | undefined>): EnrichedSection[];
 /**
  * Converts verse timings from chapter-relative to lesson-relative using each
  * section's `startTime` (set by {@link enrichSections}).
  */
 export declare function normalizeVerseTimings({ enrichedSections, scripture, lessonInfo, }: {
     enrichedSections: EnrichedSection[];
-    scripture: Array<ScripturePassage>;
+    scripture: Array<ScripturePassage | undefined>;
     lessonInfo: DbsInfo | VideoInfo;
-}): Array<ScripturePassage>;
+}): Array<ScripturePassage | undefined>;

package/dist/functions/scripturePassages.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVerseRange = void 0;
 exports.getChapterUrl = getChapterUrl;
 exports.getPassagesString = getPassagesString;
+exports.withChapterPlaceholders = withChapterPlaceholders;
 exports.getScripturePassage = getScripturePassage;
 exports.getLessonScripture = getLessonScripture;
 exports.verseToSuperscript = verseToSuperscript;
@@ -79,49 +80,78 @@ function getPassagesString(passages) {
     }
     return parts.join(', ');
 }
+/**
+ * Wraps a raw chapter fetcher with placeholder logic shared across all
+ * backends:
+ *
+ * - If the chapter is not in `availableTextChapters` nor
+ *   `availableTimingsChapters`, synthesize a one-verse placeholder without
+ *   calling the underlying fetcher.
+ * - If a fetched chapter is timings-only (verses exist but none have text), patch
+ *   verse 1's text with `noTextAvailableString` so downstream consumers can
+ *   render something.
+ */
+function withChapterPlaceholders(fetchRaw) {
+    return async ({ bibleId, chapterId, noTextAvailableString }) => {
+        const bibleInfo = (0, bibles_1.getBibleInfo)(bibleId);
+        if (!bibleInfo)
+            return undefined;
+        if (!bibleInfo.availableTextChapters.includes(chapterId) &&
+            !bibleInfo.availableTimingsChapters.includes(chapterId)) {
+            return {
+                bookName: bibleInfo.bookNames[chapterId.split('.')[0]],
+                chapterId,
+                reference: chapterId,
+                titles: null,
+                translationId: bibleId,
+                verses: [{ text: noTextAvailableString, verseId: `${chapterId}.1` }],
+            };
+        }
+        const chapter = await fetchRaw({ bibleId, chapterId });
+        if (!chapter)
+            return undefined;
+        if (chapter.verses.length > 0 && !chapter.verses.some((v) => v.text)) {
+            chapter.verses[0].text = noTextAvailableString;
+        }
+        return chapter;
+    };
+}
 /** Gets a scripture passage by extracting verses from chapters documents. */
 async function getScripturePassage({ bibleId, passageId, getChapter, noTextAvailableString, }) {
     const bibleInfo = (0, bibles_1.getBibleInfo)(bibleId);
     const { startVerse, endVerse, chapterId } = (0, bibleBooks_1.parseVerseRange)(passageId);
-    const noTextAvailableReturn = {
-        bibleId,
-        header: getPassagesString([{ passageId, bibleId }]),
-        passageId,
-        verses: [],
-    };
     if (!bibleInfo)
-        return noTextAvailableReturn;
-    const returnExpected = bibleInfo.availableTextChapters.includes(chapterId) ||
-        bibleInfo.availableTimingsChapters.includes(chapterId);
-    /**
-     * In this case, we know the bible does not have text for this chapter, so the
-     * user will see a placeholder verse.
-     */
-    if (!returnExpected) {
-        noTextAvailableReturn.verses = [
-            { text: noTextAvailableString, verseId: '' },
-        ];
-        return noTextAvailableReturn;
-    }
+        return;
     try {
         const startVerseNum = parseInt(startVerse);
         const endVerseNum = parseInt(endVerse);
-        const chapter = await getChapter({ chapterId, bibleId });
-        if (!chapter)
-            return noTextAvailableReturn;
-        const verses = extractVersesFromChapter(chapter, startVerseNum, endVerseNum);
-        if (verses.length === 0) {
-            console.warn(`No verses found for passage ${bibleId};${passageId}`);
-            return noTextAvailableReturn;
+        const chapter = await getChapter({
+            chapterId,
+            bibleId,
+            noTextAvailableString,
+        });
+        if (!chapter || chapter.verses.length === 0)
+            return;
+        /**
+         * If we only have one verse for a chapter, it is the placeholder verse and
+         * we should return them as is instead of trying to extract a passage.
+         */
+        if (chapter.verses.length === 1) {
+            return {
+                passageId,
+                bibleId: chapter.translationId,
+                verses: chapter.verses,
+            };
         }
-        if (!verses.some((v) => v.text))
+        const verses = extractVersesFromChapter(chapter, startVerseNum, endVerseNum);
+        /**
+         * For textless chapters, verse 1 is always the placeholder verse. After
+         * extraction, we may have lost verse 1, so we patch back in the placeholder
+         * text.
+         */
+        if (!verses.some((v) => v.text) && verses.length > 0)
             verses[0].text = noTextAvailableString;
-        return {
-            passageId,
-            bibleId: chapter.translationId,
-            header: getPassagesString([{ passageId, bibleId }]),
-            verses,
-        };
+        return { passageId, bibleId: chapter.translationId, verses };
     }
     catch (error) {
         console.error(`Error getting scripture passage ${passageId} in ${bibleId}`, error);
@@ -196,16 +226,23 @@ function getFtbDuration(section, lessonInfo) {
  */
 function enrichSections(lessonInfo, scripture) {
     const storySections = lessonInfo.sections.filter((s) => s.chapter === sets_1.Chapter.STORY);
-    // Forward pass: compute lengths and start times for all non-application
-    // sections.
+    /**
+     * Forward pass: compute lengths and start times for all non-application
+     * sections. We track whether any prior story had an unknown length — once
+     * that happens, every later story's startTime is unreliable (it accumulates
+     * from a bogus length), so we flag it with `ignoreTimings`.
+     */
     let currentTime = 0;
+    let priorStoryLengthUnknown = false;
     const enriched = lessonInfo.sections.map((section) => {
         if (!section.chapter)
             return { ...section, startTime: 0, length: 0 };
         currentTime += section.pauseBefore ?? 0;
         let length;
+        const isStory = section.chapter === sets_1.Chapter.STORY;
+        const ignoreTimings = isStory && priorStoryLengthUnknown ? true : undefined;
         const startTime = currentTime;
-        if (section.chapter !== sets_1.Chapter.STORY) {
+        if (!isStory) {
             length = mediaDurations_1.mediaDurations[section.languageId]?.[section.fileName];
         }
         else {
@@ -222,12 +259,14 @@ function enrichSections(lessonInfo, scripture) {
                     }
                 }
             }
+            if (length == null)
+                priorStoryLengthUnknown = true;
         }
         if (length == null) {
             console.warn(`Missing duration for section ${section.id} (${section.chapter}, ${section.fileName})`);
         }
         currentTime += length ?? 0;
-        return { ...section, length: length ?? 0, startTime };
+        return { ...section, length: length ?? 0, startTime, ignoreTimings };
     });
     // Backward pass: compute application section start times from the end of the
     // lesson file, so they are always correct even if story durations are
@@ -254,12 +293,24 @@ function enrichSections(lessonInfo, scripture) {
 function normalizeVerseTimings({ enrichedSections, scripture, lessonInfo, }) {
     const storySections = enrichedSections.filter((s) => s.chapter === sets_1.Chapter.STORY);
     return scripture.map((passage, passageIndex) => {
+        if (!passage)
+            return undefined;
         const section = storySections[passageIndex];
-        if (!section)
-            return passage;
-        const firstTimedVerse = passage.verses.find((v) => v.timings);
+        const ignoreTimingsReturn = {
+            ...passage,
+            verses: passage.verses.map((verse) => ({ ...verse, timings: null })),
+        };
+        /**
+         * Section's startTime is wrong (e.g. an earlier story's scripture hasn't
+         * loaded), so applying it as an offset would produce bogus lesson-relative
+         * timings. Strip verse timings instead, which disables karaoke until the
+         * section becomes trusted.
+         */
+        if (section.ignoreTimings)
+            return ignoreTimingsReturn;
+        const firstTimedVerse = passage?.verses.find((v) => v.timings);
         if (!firstTimedVerse?.timings)
-            return passage;
+            return ignoreTimingsReturn;
         const offset = section.startTime +
             getFtbDuration(section, lessonInfo) -
             firstTimedVerse.timings[0];

package/dist/functions/sets.js

@@ -168,6 +168,7 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             fileName: bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
                 ? passageId + '.mp3'
                 : passageInfo.chapterAudioFileName,
+            header: (0, scripturePassages_1.getPassagesString)([{ bibleId, passageId }]),
         });
         lastBook = passageInfo.book;
     });
@@ -201,6 +202,7 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
                 ftbFileName: ftbRequired
                     ? `${languageInfo.contentLanguages.ftbs}.${passageInfo.book}.mp3`
                     : undefined,
+                header: (0, scripturePassages_1.getPassagesString)([{ bibleId: modifier.bibleId, passageId }]),
             });
             lastBook = passageInfo.book;
             concatStoryIndex++;
@@ -208,7 +210,7 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
     });
     applicationQuestions.forEach((questionId, index) => {
         const fileName = questionId.includes('video')
-            ? `${languageInfo.contentLanguages.trainingVideos}.${lessonId}.mp3`
+            ? `${languageInfo.contentLanguages.trainingVideos}.${lessonId}.mp4`
             : `${languageInfo.contentLanguages.questionAudio}.${questionId}.mp3`;
         sections.push({
             id: questionId,

package/dist/types/languages.d.ts

@@ -1,6 +1,7 @@
 import z from 'zod';
 import { BibleAudio } from '../data/bibleAudios/bibleAudios.zod';
 import { BibleText } from '../data/bibleTexts/bibleTexts.zod';
+import type { CurriculumOnboarding } from '../data/curriculumOnboarding/curriculumOnboarding.zod';
 import type { CurriculumQuestions } from '../data/curriculumQuestions/curriculumQuestions.zod';
 import { type Language } from '../data/languages/languages.zod';
 import { LessonPauses } from '../data/lessonPauses/lessonPauses.zod';
@@ -16,6 +17,7 @@ export interface BibleInfo extends Omit<BibleText, 'language' | 'copyright'>, Om
     availableTextChapters: string[];
     availableTimingsChapters: string[];
     availableAudioChapters: string[];
+    availableChapters: string[];
     fullCopyright: string;
     bookNames: Record<string, string>;
     script: Scripts[number];
@@ -27,6 +29,7 @@ declare const RequiredBridgeLanguages: z.ZodObject<{
     titles: z.ZodNonOptional<z.ZodOptional<z.ZodString>>;
     questionText: z.ZodNonOptional<z.ZodOptional<z.ZodString>>;
     questionAudio: z.ZodNonOptional<z.ZodOptional<z.ZodString>>;
+    onboardingPassages: z.ZodNonOptional<z.ZodOptional<z.ZodString>>;
 }, z.core.$strip>;
 type RequiredBridgeLanguages = z.infer<typeof RequiredBridgeLanguages>;
 export interface LanguageInfo extends Omit<Language, 'bible' | 'bibleFallbacks' | 'script' | 'bridgeLanguages'> {
@@ -57,6 +60,12 @@ export interface LanguageInfo extends Omit<Language, 'bible' | 'bibleFallbacks'
      */
     script: Scripts[number];
     contentLanguages: RequiredBridgeLanguages;
+    /**
+     * The passage ids to use for the onboarding DBS, keyed by the user's "What
+     * brings you to Waha?" answer. Sourced from this language's onboarding
+     * curriculum (some languages use different psalm numberings).
+     */
+    onboardingPassageIds: CurriculumOnboarding[number]['passages'];
 }
 export interface MeetTranslations {
     sets: TranslationsSet[string];

package/dist/types/scripturePassages.d.ts

@@ -2,7 +2,6 @@ import z from 'zod';
 export declare const ScripturePassageSchema: z.ZodObject<{
     passageId: z.ZodString;
     bibleId: z.ZodString;
-    header: z.ZodString;
     verses: z.ZodArray<z.ZodObject<{
         text: z.ZodString;
         timings: z.ZodOptional<z.ZodUnion<readonly [z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, z.ZodNull]>>;

package/dist/types/scripturePassages.js

@@ -9,6 +9,5 @@ const bibleChapters_1 = require("./bibleChapters");
 exports.ScripturePassageSchema = zod_1.default.object({
     passageId: zod_1.default.string(),
     bibleId: zod_1.default.string(),
-    header: zod_1.default.string(),
     verses: zod_1.default.array(bibleChapters_1.BibleVerse),
 });

package/dist/types/sets.d.ts

@@ -50,6 +50,13 @@ export interface Section {
 export interface EnrichedSection extends Section {
     startTime: number;
     length: number;
+    /**
+     * True when this section's `startTime` can't be trusted — currently set on
+     * story sections that follow another story whose length couldn't be
+     * determined (e.g. scripture still loading). Consumers should hide play
+     * buttons and skip these sections when snapping/seeking.
+     */
+    ignoreTimings?: boolean;
 }
 export interface DbsInfo extends BaseInfo, SetInfo, Lesson {
     type: 'dbs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waha-shared",
-  "version": "1.0.307",
+  "version": "1.0.309",
   "author": "Waha",
   "dependencies": {
     "@types/signale": "^1.4.7",