waha-shared 1.0.343 → 1.0.345

package/dist/functions/utils.js

@@ -1,8 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firebasePath = exports.join = void 0;
-const firebase_1 = require("../data/firebase");
+exports.getCachedDuration = exports.basenamenoext = exports.extname = exports.dirname = exports.first = exports.basename = exports.join = void 0;
+const mediaDurations_1 = require("../data/mediaDurations");
 const join = (...parts) => parts.join('/').replace(/\/+/g, '/');
 exports.join = join;
-const firebasePath = (path) => firebase_1.firebaseUrl + encodeURIComponent(path) + `?alt=media`;
-exports.firebasePath = firebasePath;
+const basename = (p) => p.split('/').pop();
+exports.basename = basename;
+const first = (p) => p.split('/')[0];
+exports.first = first;
+const dirname = (p) => p.substring(0, p.lastIndexOf('/'));
+exports.dirname = dirname;
+const extname = (p) => p.slice(p.lastIndexOf('.'));
+exports.extname = extname;
+const basenamenoext = (p) => {
+    const base = (0, exports.basename)(p);
+    const dotIndex = base.lastIndexOf('.');
+    return dotIndex !== -1 ? base.slice(0, dotIndex) : base;
+};
+exports.basenamenoext = basenamenoext;
+const getCachedDuration = (path) => mediaDurations_1.mediaDurations[(0, exports.first)(path)]?.[(0, exports.basename)(path)];
+exports.getCachedDuration = getCachedDuration;

package/dist/types/sets.d.ts

@@ -13,13 +13,6 @@ export interface SetInfo extends Set {
     setTag?: string;
     setLink: string;
 }
-export interface Content {
-    id: string;
-    localFileName: string;
-    remoteFileName: string;
-    path: string;
-    url: string;
-}
 export interface BaseInfo extends LanguageInfo {
     lessonNumber: string;
     lessonTitle: string | undefined;
@@ -32,7 +25,6 @@ export interface BaseInfo extends LanguageInfo {
 }
 export interface Section {
     id: string;
-    languageId: string;
     header?: string;
     text?: string;
     index: number;
@@ -44,8 +36,8 @@ export interface Section {
      * Filename for the "From the Book" clip to insert before this section, if
      * there is one.
      */
-    ftbFileName?: string;
-    fileName: string;
+    ftbPath?: string;
+    path: string;
 }
 export interface EnrichedSection extends Section {
     startTime: number;
@@ -60,18 +52,29 @@ export interface EnrichedSection extends Section {
 }
 export interface DbsInfo extends BaseInfo, SetInfo, Lesson {
     type: 'dbs';
-    full: Content;
-    story: Content;
-    dbsCast: {
-        remoteFileName: string;
-        url: string;
-    };
+    fullPath: string;
+    storyPath: string;
+    dbsCastPath: string;
     passagesString: string;
 }
 export interface VideoInfo extends BaseInfo, SetInfo, Lesson {
     type: 'video';
-    video: Content;
-    trainingVideo: Content | undefined;
+    videoPath: string;
+    trainingVideoPath: string | undefined;
+    trainingVideoNarrationPath: string | undefined;
+    trainingVideoNarrationWithMusicPath: string | undefined;
+    trainingVideoOriginalPath: string | undefined;
+    /**
+     * Full audio file (training-video audio + scripture + questions). Populated
+     * only for video lessons that have audio to play (e.g. dmCourse lessons with
+     * scripture passages). Video-only lessons leave this undefined.
+     */
+    fullPath?: string;
+    /**
+     * Story audio file (scripture passages only). Same population rules as
+     * `full`.
+     */
+    storyPath?: string;
     lessonSectionHeader: string | undefined;
     lessonSectionBody: string | undefined;
     youtubeLink: string | undefined;
@@ -79,7 +82,7 @@ export interface VideoInfo extends BaseInfo, SetInfo, Lesson {
 }
 export interface EqInfo extends BaseInfo, SetInfo, Lesson {
     type: 'eq';
-    eq: Content;
+    eqPath: string;
 }
 export type LessonInfo = DbsInfo | VideoInfo | EqInfo;
 export declare enum Chapter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waha-shared",
-  "version": "1.0.343",
+  "version": "1.0.345",
   "author": "Waha",
   "dependencies": {
     "@types/signale": "^1.4.7",
@@ -27,6 +27,7 @@
   "license": "MIT",
   "scripts": {
     "build": "npx tsc && copyfiles \"data/**/*.json\" dist",
-    "update": "yarn build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && npm version patch && git add . && git commit -m 'Update shared types' && bash -c 'npm publish --access public --registry https://registry.npmjs.org --//registry.npmjs.org/:_authToken=$(grep NPM_TOKEN= ../.env | cut -d \"=\" -f2-)'"
+    "update": "yarn build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && npm version patch && git add . && git commit -m 'chore: update shared types' && bash -c 'npm publish --access public --registry https://registry.npmjs.org --//registry.npmjs.org/:_authToken=$(grep NPM_TOKEN= ../.env | cut -d \"=\" -f2-)'",
+    "updateManual": "(npm whoami || npm login) && yarn build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && git add dist package.json && git commit -m 'chore: update shared types' && npm publish"
   }
 }