waha-shared 1.0.3 → 1.0.4

package/dist/functions/languages.js

@@ -13,25 +13,25 @@ exports.numerals = numerals;
 exports.getFontFamily = getFontFamily;
 exports.getAppTranslations = getAppTranslations;
 exports.getMeetTranslations = getMeetTranslations;
-const bibleAudios_1 = __importDefault(require("../data/bibleAudios"));
-const bibleStatuses_1 = __importDefault(require("../data/bibleStatuses"));
-const bibleTexts_1 = __importDefault(require("../data/bibleTexts"));
-const foundationsCurriculums_1 = __importDefault(require("../data/foundationsCurriculums"));
-const phoneLanguages_1 = __importDefault(require("../data/languageResources/phoneLanguages"));
-const languages_1 = __importDefault(require("../data/languages"));
-const numeralMaps_1 = __importDefault(require("../data/numeralMaps"));
-const questionsCurriculums_1 = __importDefault(require("../data/questionsCurriculums"));
-const topicsCurriculums_1 = __importDefault(require("../data/topicsCurriculums"));
+const bibleAudios_1 = require("../data/bibleAudios");
+const bibleStatuses_1 = require("../data/bibleStatuses");
+const bibleTexts_1 = require("../data/bibleTexts");
+const foundationsCurriculums_1 = require("../data/foundationsCurriculums");
+const phoneLanguages_1 = require("../data/languageResources/phoneLanguages");
+const languages_1 = require("../data/languages");
+const numeralMaps_1 = require("../data/numeralMaps");
+const questionsCurriculums_1 = require("../data/questionsCurriculums");
+const topicsCurriculums_1 = require("../data/topicsCurriculums");
 const appTranslations_1 = __importDefault(require("../translations/appTranslations"));
 const introductionTranslations_1 = __importDefault(require("../translations/introductionTranslations"));
 const questionTranslations_1 = __importDefault(require("../translations/questionTranslations"));
 const setTranslations_1 = __importDefault(require("../translations/setTranslations"));
 const bibleChapterUtils_1 = require("./bibleChapterUtils");
 function getBibleInfo(bibleId) {
-    const bibleText = bibleTexts_1.default.find((t) => t.bibleTextId === bibleId);
-    const bibleAudio = bibleAudios_1.default.find((t) => t.bibleAudioId === bibleText?.audioId ||
+    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.default.find((l) => l.languageId === bibleText?.language);
+    const language = languages_1.languages.find((l) => l.languageId === bibleText?.language);
     return bibleText && bibleAudio
         ? {
             ...bibleText,
@@ -39,7 +39,7 @@ function getBibleInfo(bibleId) {
             language,
             availableTextChapters: (0, bibleChapterUtils_1.getAvailableChapters)(bibleText.bibleTextId, 'text'),
             availableAudioChapters: (0, bibleChapterUtils_1.getAvailableChapters)(bibleAudio.bibleAudioId, 'audio'),
-            bookNames: bibleStatuses_1.default[bibleText.bibleTextId]?.bookNames || {},
+            bookNames: bibleStatuses_1.bibleStatuses[bibleText.bibleTextId]?.bookNames || {},
             fullCopyright: (bibleText.copyright ?? '') + '\n\n' + (bibleAudio.copyright ?? ''),
         }
         : undefined;
@@ -49,15 +49,15 @@ function getIsRtl(script) {
 }
 function getLanguageInfo(languageId) {
     const defaultReturn = {
-        ...languages_1.default[0],
-        sets: [...foundationsCurriculums_1.default[0].sets],
-        questionSets: questionsCurriculums_1.default[0].questionSets,
+        ...languages_1.languages[0],
+        setIds: [...foundationsCurriculums_1.foundationsCurriculums[0].sets],
+        questionSets: questionsCurriculums_1.questionsCurriculums[0].questionSets,
         bible: {
-            ...bibleTexts_1.default[0],
-            ...bibleAudios_1.default[0],
+            ...bibleTexts_1.bibleTexts[0],
+            ...bibleAudios_1.bibleAudios[0],
             availableTextChapters: [],
             availableAudioChapters: [],
-            language: languages_1.default[0],
+            language: languages_1.languages[0],
             fullCopyright: '',
             bookNames: {},
         },
@@ -65,34 +65,34 @@ function getLanguageInfo(languageId) {
         trainingVideoLanguage: '',
         isRtl: false,
     };
-    const language = languages_1.default.find((language) => language.languageId === languageId);
+    const language = languages_1.languages.find((language) => language.languageId === languageId);
     if (!language) {
         console.error(`Can't find language with id ${languageId}`);
         return defaultReturn;
     }
-    const questionsCurriculum = questionsCurriculums_1.default.find((questionCurriculum) => questionCurriculum.curriculumId === language.curriculum.questions);
-    const foundationsCurriculum = foundationsCurriculums_1.default.find((foundationsCurriculum) => foundationsCurriculum.curriculumId === language.curriculum.foundations);
-    const topicsCurriculum = topicsCurriculums_1.default.find((topicsCurriculum) => topicsCurriculum.curriculumId === language?.curriculum.topics);
-    let sets = [];
+    const questionsCurriculum = questionsCurriculums_1.questionsCurriculums.find((questionCurriculum) => questionCurriculum.curriculumId === language.curriculum.questions);
+    const foundationsCurriculum = foundationsCurriculums_1.foundationsCurriculums.find((foundationsCurriculum) => foundationsCurriculum.curriculumId === language.curriculum.foundations);
+    const topicsCurriculum = topicsCurriculums_1.topicsCurriculums.find((topicsCurriculum) => topicsCurriculum.curriculumId === language?.curriculum.topics);
+    let setIds = [];
     if (foundationsCurriculum)
-        sets.push(...foundationsCurriculum.sets);
+        setIds.push(...foundationsCurriculum.sets);
     if (topicsCurriculum)
-        sets.push(...topicsCurriculum.sets);
+        setIds.push(...topicsCurriculum.sets);
     if (language.dmCourseStatus === 'launched' ||
         language.dmCourseStatus === 'testing' ||
         language.videoBridgeLanguage)
-        sets.push('03.009');
+        setIds.push('03.009');
     if (language.gdmcStatus === 'launched' || language.gdmcStatus === 'testing') {
-        sets.push('03.005');
-        sets.push('03.006');
-        sets.push('03.007');
+        setIds.push('03.005');
+        setIds.push('03.006');
+        setIds.push('03.007');
     }
     if (language.unsupportedDbsSets)
-        sets = sets.filter((set) => !language.unsupportedDbsSets?.includes(set));
+        setIds = setIds.filter((set) => !language.unsupportedDbsSets?.includes(set));
     const toReturn = {
         ...language,
         isRtl: getIsRtl(language.script),
-        sets,
+        setIds: setIds,
         questionSets: questionsCurriculum?.questionSets ?? defaultReturn.questionSets,
         bible: getBibleInfo(language.bible) || defaultReturn.bible,
         bibleFallback: getBibleInfo(language.bibleFallback),
@@ -104,14 +104,14 @@ function getInitialAppInterfaceLanguage(userPhoneLanguages) {
     for (const userPhoneLanguage of userPhoneLanguages) {
         if (!userPhoneLanguage)
             continue;
-        for (const phoneLanguage of phoneLanguages_1.default) {
+        for (const phoneLanguage of phoneLanguages_1.phoneLanguages) {
             // Step 1: find the matching phone language.
             if (phoneLanguage.twoLetterId !== userPhoneLanguage.slice(0, 2))
                 continue;
             // Step 2: search through alternatives to find the best option.
             for (const alternative of phoneLanguage.alternatives) {
                 // If the alternative is a valid waha app interface language, we've found a match.
-                if (languages_1.default.some((wahaLanguage) => wahaLanguage.appInterface !== undefined &&
+                if (languages_1.languages.some((wahaLanguage) => wahaLanguage.appInterface !== undefined &&
                     isLanguageAvailable(wahaLanguage.status) &&
                     wahaLanguage.languageId === alternative.threeLetterId))
                     return alternative.threeLetterId;
@@ -138,8 +138,8 @@ const superscriptToRegular = {
     '⁹': '9',
 };
 function numerals(text, script) {
-    if (script in numeralMaps_1.default) {
-        const map = numeralMaps_1.default[script];
+    if (script in numeralMaps_1.numeralMaps) {
+        const map = numeralMaps_1.numeralMaps[script];
         if (!map)
             return text;
         return text

package/dist/functions/scripturePassages.d.ts

@@ -1,4 +1,4 @@
-import { type BibleChapters } from '../data/typescript/bibleChapters';
+import { BibleChapters } from '../data/typescript/bibleChapters';
 import type { LanguageInfo } from '../types/languages';
 type BibleChapter = BibleChapters[number];
 export interface ScripturePassage {

package/dist/functions/scripturePassages.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPassagesString = getPassagesString;
 exports.getLessonScripture = getLessonScripture;
 exports.parseBibleSnapshot = parseBibleSnapshot;
 exports.verseToSuperscript = verseToSuperscript;
-const bibleStatuses_1 = __importDefault(require("../data/bibleStatuses"));
+const bibleStatuses_1 = require("../data/bibleStatuses");
 const bibleChapters_1 = require("../data/typescript/bibleChapters");
 const languages_1 = require("../functions/languages");
 /**
@@ -67,7 +64,7 @@ function getPassagesString(passageIds, language) {
         let bookName = 
         // American sign language should use English book names.
         language.languageId === 'ase'
-            ? bibleStatuses_1.default.BSB.bookNames[startBook]
+            ? bibleStatuses_1.bibleStatuses.BSB.bookNames[startBook]
             : language.bible.bookNames[startBook];
         if (!bookName) {
             bookName = language.bibleFallback?.bookNames[startBook];
@@ -209,7 +206,7 @@ function parseBibleSnapshot(snapshot, bible) {
         return [];
     }
     for (const doc of snapshot.docs) {
-        const chapterParse = bibleChapters_1.bibleChapters.element.safeParse(doc.data());
+        const chapterParse = bibleChapters_1.BibleChapters.element.safeParse(doc.data());
         if (!chapterParse.success) {
             console.warn('Skipping invalid bible chapter document', doc.id, chapterParse.error.issues.map((i) => `${i.path.join('.')}: ${i.message}`));
         }

package/dist/functions/sets.d.ts

@@ -2,11 +2,11 @@ import type { AppTranslations } from '../data/typescript/appTranslations';
 import type { LanguageInfo, MeetTranslations } from '../types/languages';
 import { Lesson, LessonInfo, SetInfo, type Section } from '../types/sets';
 export declare const firebaseUrl = "https://firebasestorage.googleapis.com/v0/b/waha-app-db.appspot.com/o/";
-export declare function getSetInfo({ setId, meetLanguageId, sets, t, }: {
+export declare function getSetInfo({ setId, meetLanguageId, setIds, t, }: {
     setId: string;
     meetLanguageId: string;
     t: MeetTranslations & AppTranslations[string];
-    sets: string[];
+    setIds: string[];
 }): SetInfo | undefined;
 export declare function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }: {
     lessonId: Lesson['lessonId'] | undefined;

package/dist/functions/sets.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firebaseUrl = void 0;
 exports.getSetInfo = getSetInfo;
@@ -9,22 +6,22 @@ exports.getLessonInfo = getLessonInfo;
 exports.convertSToString = convertSToString;
 exports.shouldShowLesson = shouldShowLesson;
 exports.calculateSectionTimings = calculateSectionTimings;
-const mediaDurations_1 = __importDefault(require("../data/mediaDurations"));
-const questions_1 = __importDefault(require("../data/questions"));
-const sets_1 = __importDefault(require("../data/sets"));
-const specialIds_1 = __importDefault(require("../data/specialIds"));
-const videos_1 = __importDefault(require("../data/youtube/videos"));
+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 videos_1 = require("../data/youtube/videos");
 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, sets, t, }) {
+function getSetInfo({ setId, meetLanguageId, setIds, t, }) {
     const idComponents = setId.split('.');
     const category = idComponents[0] === '01'
         ? 'Foundations'
         : idComponents[0] === '02'
             ? 'Topics'
             : 'WahaTraining';
-    const setNumber = (sets
+    const setNumber = (setIds
         .filter((set) => set.split('.')[0] === idComponents[0])
         .findIndex((set) => set === setId) + 1).toString();
     const thisSetTranslations = t.sets.find((set) => set.setId === setId);
@@ -33,7 +30,7 @@ function getSetInfo({ setId, meetLanguageId, sets, t, }) {
         : idComponents[0] === '02'
             ? t.topics
             : t.training;
-    const set = sets_1.default.find((set) => set.setId === setId);
+    const set = sets_1.sets.find((set) => set.setId === setId);
     if (!set)
         return;
     const toReturn = {
@@ -61,7 +58,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
             getSetInfo({
                 setId: [category, setNumber].join('.'),
                 meetLanguageId,
-                sets: meetLanguageInfo.sets,
+                setIds: meetLanguageInfo.setIds,
                 t,
             });
     if (!setInfo) {
@@ -90,7 +87,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
         },
     ];
     fellowshipQuestions.forEach((questionId, index) => {
-        const hasBeep = questions_1.default.find((question) => question.questionId === questionId)
+        const hasBeep = questions_1.questions.find((question) => question.questionId === questionId)
             ?.hasBeep ?? false;
         sections.push({
             id: questionId,
@@ -103,7 +100,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
             hasBeep,
         });
     });
-    if (specialIds_1.default.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
+    if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
         sections.push({
             id: 'eq',
             isChapter: false,
@@ -115,7 +112,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
             hasBeep: false,
         });
     }
-    else if (specialIds_1.default.growingAsDmcSetIds.includes(setInfo.setId)) {
+    else if (specialIds_1.specialIds.growingAsDmcSetIds.includes(setInfo.setId)) {
         sections.push({
             id: 'introduction',
             isChapter: false,
@@ -140,7 +137,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
         });
     });
     applicationQuestions.forEach((questionId, index) => {
-        const hasBeep = questions_1.default.find((question) => question.questionId === questionId)
+        const hasBeep = questions_1.questions.find((question) => question.questionId === questionId)
             ?.hasBeep ?? false;
         sections.push({
             id: questionId,
@@ -164,7 +161,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
         ...setInfo,
         ...lesson,
     };
-    if (specialIds_1.default.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
+    if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
         const languageId = meetLanguageInfo.introBridge ?? meetLanguageId;
         const id = `${languageId}.eq`;
         const fileName = `${id}.mp3`;
@@ -182,7 +179,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
             },
         };
     }
-    else if (setInfo.setId === specialIds_1.default.dmCourseSetId ||
+    else if (setInfo.setId === specialIds_1.specialIds.dmCourseSetId ||
         meetLanguageId === 'ase') {
         let video;
         if (meetLanguageInfo.languageId === 'ase') {
@@ -211,10 +208,10 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, }) {
             };
         }
         let youtubeLink;
-        if (video.remoteFileName && video.remoteFileName in videos_1.default)
+        if (video.remoteFileName && video.remoteFileName in videos_1.videos)
             youtubeLink =
                 'https://www.youtube.com/watch?v=' +
-                    videos_1.default[video.remoteFileName];
+                    videos_1.videos[video.remoteFileName];
         return {
             type: 'video',
             ...baseInfo,
@@ -295,26 +292,26 @@ function shouldShowLesson(lessonInfo, languageInfo) {
         console.log('Missing lesson info or lessonTitle lesson:', lessonInfo?.lessonId);
         return false;
     }
-    else if (specialIds_1.default.growingAsDmcSetIds.includes(lessonInfo.setId) &&
+    else if (specialIds_1.specialIds.growingAsDmcSetIds.includes(lessonInfo.setId) &&
         (lessonInfo.lessonIntroduction === undefined ||
             lessonInfo.lessonIntroduction === '')) {
         console.log('Missing intro for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'eq' &&
-        !mediaDurations_1.default[languageInfo.introBridge ?? languageInfo.languageId]
+        !mediaDurations_1.mediaDurations[languageInfo.introBridge ?? languageInfo.languageId]
             .lessons[lessonInfo.eq.remoteFileName]) {
         console.log('Missing remote eq file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'dbs' &&
-        !mediaDurations_1.default[lessonInfo.meetLanguageId].lessons[lessonInfo.full.remoteFileName]) {
+        !mediaDurations_1.mediaDurations[lessonInfo.meetLanguageId].lessons[lessonInfo.full.remoteFileName]) {
         console.log('Missing remote dbs file for lesson:', lessonInfo.lessonId);
         return false;
     }
     else if (lessonInfo.type === 'video' &&
         lessonInfo.video &&
-        !mediaDurations_1.default[lessonInfo.meetLanguageId].lessons[lessonInfo.video.remoteFileName]) {
+        !mediaDurations_1.mediaDurations[lessonInfo.meetLanguageId].lessons[lessonInfo.video.remoteFileName]) {
         console.log('Missing remote video for lesson:', lessonInfo.video.remoteFileName);
         return false;
     }
@@ -332,7 +329,7 @@ function shouldShowLesson(lessonInfo, languageInfo) {
  * @returns Map of section ID to start time in seconds
  */
 function calculateSectionTimings(sections, totalDuration, languageId) {
-    const languageDurations = mediaDurations_1.default[languageId];
+    const languageDurations = mediaDurations_1.mediaDurations[languageId];
     const getQuestionDuration = (questionId) => {
         const fileName = `${languageId}.${questionId}.mp3`;
         return languageDurations.questions[fileName] ?? 0;

package/dist/translations/appTranslations.js

@@ -5,4 +5,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const appTranslations_1 = require("../data/typescript/appTranslations");
 const appTranslations_json_1 = __importDefault(require("./appTranslations.json"));
-exports.default = appTranslations_1.appTranslations.parse(appTranslations_json_1.default);
+exports.default = appTranslations_1.AppTranslations.parse(appTranslations_json_1.default);

package/dist/translations/introductionTranslations.js

@@ -5,4 +5,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const introductionTranslations_1 = require("../data/typescript/introductionTranslations");
 const introductionTranslations_json_1 = __importDefault(require("./introductionTranslations.json"));
-exports.default = introductionTranslations_1.introductionTranslations.parse(introductionTranslations_json_1.default);
+exports.default = introductionTranslations_1.IntroductionTranslations.parse(introductionTranslations_json_1.default);

package/dist/translations/questionTranslations.js

@@ -5,4 +5,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const questionTranslations_1 = require("../data/typescript/questionTranslations");
 const questionTranslations_json_1 = __importDefault(require("./questionTranslations.json"));
-exports.default = questionTranslations_1.questionTranslations.parse(questionTranslations_json_1.default);
+exports.default = questionTranslations_1.QuestionTranslations.parse(questionTranslations_json_1.default);

package/dist/translations/setTranslations.js

@@ -5,4 +5,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const setTranslations_1 = require("../data/typescript/setTranslations");
 const setTranslations_json_1 = __importDefault(require("./setTranslations.json"));
-exports.default = setTranslations_1.setTranslations.parse(setTranslations_json_1.default);
+exports.default = setTranslations_1.SetTranslations.parse(setTranslations_json_1.default);

package/dist/types/languages.d.ts

@@ -16,7 +16,7 @@ export interface BibleInfo extends Omit<BibleText, 'language' | 'copyright'>, Om
     bookNames: Record<string, string>;
 }
 export interface LanguageInfo extends Omit<Language, 'bible' | 'bibleFallback'> {
-    sets: string[];
+    setIds: string[];
     questionSets: QuestionsCurriculums[number]['questionSets'];
     bible: BibleInfo;
     bibleFallback: BibleInfo | undefined;

package/dist/types/notifications.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PushNotificationRecordSchema = exports.PushNotificationPayloadSchema = void 0;
-const notification_1 = require("../data/typescript/notification");
 const zod_1 = require("zod");
+const notification_1 = require("../data/typescript/notification");
 exports.PushNotificationPayloadSchema = zod_1.z.object({
     actionUrl: zod_1.z.string().url().optional(),
     /**
@@ -24,7 +24,7 @@ exports.PushNotificationPayloadSchema = zod_1.z.object({
 });
 exports.PushNotificationRecordSchema = zod_1.z.object({
     date: zod_1.z.string(),
-    notification: notification_1.notification,
+    notification: notification_1.Notification,
     receivedTokens: zod_1.z.array(zod_1.z.string()),
     receivedUserIds: zod_1.z.array(zod_1.z.string()),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waha-shared",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Waha",
   "description": "Shared assets for Waha's various apps",
   "files": [