@helloao/cli 0.0.13 → 0.0.14

package/dist/cjs/cli.cjs

@@ -5959,14 +5959,16 @@ function getBookId(book) {
   return null;
 }
 var KNOWN_SKIPPED_VERSES = /* @__PURE__ */ new Set([
+  "MAT 12:47",
   "MAT 17:21",
   "MAT 18:11",
   "MAT 23:14",
-  "MAR 7:16",
-  "MAR 9:44",
-  "MAR 9:46",
-  "MAR 11:26",
+  "MRK 7:16",
+  "MRK 9:44",
+  "MRK 9:46",
+  "MRK 11:26",
   "LUK 17:36",
+  "LUK 23:17",
   "JHN 5:4",
   "ACT 8:37",
   "ACT 15:34",
@@ -6029,19 +6031,23 @@ function generateApiForDataset(dataset, options = {}) {
     };
     let translationChapters = [];
     for (let { chapters, ...book } of books) {
+      const firstChapterNumber = chapters[0].chapter.number;
+      const lastChapterNumber = chapters[chapters.length - 1].chapter.number;
       const apiBook = {
         ...book,
+        firstChapterNumber,
         firstChapterApiLink: bookChapterApiLink(
           translation.id,
           getBookLink(book),
-          1,
+          firstChapterNumber,
           "json",
           apiPathPrefix
         ),
+        lastChapterNumber,
         lastChapterApiLink: bookChapterApiLink(
           translation.id,
           getBookLink(book),
-          chapters.length,
+          lastChapterNumber,
           "json",
           apiPathPrefix
         ),
@@ -6166,22 +6172,26 @@ function generateApiForDataset(dataset, options = {}) {
     };
     let commentaryChapters = [];
     for (let { chapters, ...book } of books) {
+      const firstChapterNumber = chapters[0]?.chapter.number ?? null;
+      const lastChapterNumber = chapters[chapters.length - 1]?.chapter.number ?? null;
       const apiBook = {
         ...book,
-        firstChapterApiLink: bookCommentaryChapterApiLink(
+        firstChapterNumber,
+        firstChapterApiLink: firstChapterNumber ? bookCommentaryChapterApiLink(
           commentary.id,
           getBookLink(book),
-          1,
+          firstChapterNumber,
           "json",
           apiPathPrefix
-        ),
-        lastChapterApiLink: bookCommentaryChapterApiLink(
+        ) : null,
+        lastChapterNumber,
+        lastChapterApiLink: lastChapterNumber ? bookCommentaryChapterApiLink(
           commentary.id,
           getBookLink(book),
-          chapters.length,
+          lastChapterNumber,
           "json",
           apiPathPrefix
-        ),
+        ) : null,
         numberOfChapters: chapters.length,
         totalNumberOfVerses: 0
       };
@@ -13961,8 +13971,9 @@ function getDbPath(p) {
   }
   return getDbPathFromDir(process.cwd());
 }
-function getPrismaDbFromDir(dir) {
-  const dbPath = getDbPathFromDir(dir);
+function getPrismaDb(path6) {
+  const dbPath = getDbPath(path6);
+  console.log("Opening database at", dbPath);
   const prisma = new import_prisma_gen.PrismaClient({
     datasources: {
       db: {
@@ -13972,12 +13983,13 @@ function getPrismaDbFromDir(dir) {
   });
   return prisma;
 }
-async function getDbFromDir(dir) {
-  const dbPath = getDbPathFromDir(dir);
-  const db = await getDb(dbPath);
+async function getDb(path6) {
+  const dbPath = getDbPath(path6);
+  const db = await getDbFromPath(dbPath);
   return db;
 }
-async function getDb(dbPath) {
+async function getDbFromPath(dbPath) {
+  console.log("Opening database at", dbPath);
   const logger2 = log_exports.getLogger();
   const migrationsPath = await getMigrationsPath();
   if (!migrationsPath) {
@@ -14922,7 +14934,7 @@ async function initDb(dbPath, options) {
       }
     }
   } else {
-    const db = await getDb(getDbPath(dbPath));
+    const db = await getDb(dbPath);
     db.close();
   }
 }
@@ -14931,7 +14943,7 @@ async function importTranslation(dir, dirs, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     await importTranslations(
       db,
@@ -14949,7 +14961,7 @@ async function importTranslations2(dir, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     const files = await (0, import_promises5.readdir)(dir);
     const translationDirs = files.map((f) => import_node_path2.default.resolve(dir, f));
@@ -14969,7 +14981,7 @@ async function importCommentary(dir, dirs, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     await importCommentaries(
       db,
@@ -14987,7 +14999,7 @@ async function importCommentaries2(dir, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     const files = await (0, import_promises5.readdir)(dir);
     const commentaryDirs = files.map((f) => import_node_path2.default.resolve(dir, f));
@@ -15158,7 +15170,7 @@ Found ${sources.length} sources for '${translationQuery}':`);
 }
 async function sourceTranslations(outputDir, translations, options = {}) {
   const logger2 = log_exports.getLogger();
-  const {
+  let {
     convertToUsx3 = false,
     useDatabase = true,
     // Default to true
@@ -15193,20 +15205,27 @@ async function sourceTranslations(outputDir, translations, options = {}) {
   let db = null;
   let sourceExists = null;
   let sourceUpsert = null;
-  let skippedByDatabase = 0;
   if (useDatabase) {
+    if (!overwrite) {
+      overwrite = true;
+      console.warn(
+        "Overwriting files is enabled due to database tracking."
+      );
+    }
     logger2.log("Connecting to database for download tracking...");
-    db = await getDbFromDir(process.cwd());
+    db = await getDb(options.db);
     sourceExists = db.prepare(
       "SELECT usfmZipEtag, usfmDownloadDate FROM EBibleSource WHERE id = @id AND sha256 = @sha256;"
     );
+    let skippedByDatabase = 0;
+    let sourcesChecked = 0;
+    let notDownloaded = 0;
     filteredSources = filteredSources.filter((source) => {
-      if (overwrite) {
-        return true;
-      }
       const existingSource = sourceExists.get(source);
+      sourcesChecked++;
       if (existingSource) {
         if (!existingSource.usfmDownloadDate) {
+          notDownloaded++;
           return true;
         }
         source.usfmZipEtag = existingSource.usfmZipEtag;
@@ -15221,13 +15240,18 @@ async function sourceTranslations(outputDir, translations, options = {}) {
     });
     if (skippedByDatabase > 0) {
       logger2.log(
-        `Database filtering: Skipped ${skippedByDatabase} already downloaded sources`
+        `Database filtering: Skipped ${skippedByDatabase} already downloaded sources.`
       );
     } else {
-      logger2.log(
-        "Database filtering: No sources were skipped (none previously downloaded)"
-      );
+      logger2.log(`Database filtering: No sources were skipped.`);
     }
+    logger2.log(`Database filtering:`);
+    logger2.log(`   \u2022 Checked: ${sourcesChecked}`);
+    logger2.log(`   \u2022 Skipped: ${skippedByDatabase}`);
+    logger2.log(`   \u2022 New: ${notDownloaded}`);
+    logger2.log(
+      `   \u2022 Needs Update: ${filteredSources.length - notDownloaded}`
+    );
     sourceUpsert = db.prepare(`INSERT INTO EBibleSource(
             id, translationId, title, shortTitle, languageCode, textDirection, copyright, description,
             oldTestamentBooks, oldTestamentChapters, oldTestamentVerses,
@@ -15434,9 +15458,9 @@ Total selected: ${selectedSources.length} sources from ${sourceGroups.size} tran
             if (!convertToUsx3) {
               source.usfmDownloadDate = import_luxon2.DateTime.utc().toISO();
               source.usfmDownloadPath = outputDir;
-            }
-            if (sourceUpsert) {
-              sourceUpsert.run(source);
+              if (sourceUpsert) {
+                sourceUpsert.run(source);
+              }
             }
           } catch (error) {
             numErrored++;
@@ -15704,7 +15728,7 @@ async function start() {
   globalThis.Element = import_linkedom2.Element;
   globalThis.Node = import_linkedom2.Node;
   const program = new import_commander.Command();
-  program.name("helloao").description("A CLI for managing a Free Use Bible API.").version("0.0.1");
+  program.name("helloao").description("A CLI for managing a Free Use Bible API.").option("--db <path>", "Path to the database file.").version("0.0.1");
   program.command("init [path]").description("Initialize a new Bible API DB.").option(
     "--source <path>",
     "The source database to copy from. If given a HTTPS URL, then the database will be downloaded from the given URL."
@@ -15712,7 +15736,10 @@ async function start() {
     "--language <languages...>",
     "The language(s) that the database should be initialized with."
   ).action(async (dbPath, options) => {
-    await initDb(dbPath, options);
+    await initDb(dbPath, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("generate-translation-metadata").description("Generates a metadata file for a translation.").action(async () => {
     const meta = await askForMetadata();
@@ -15741,22 +15768,34 @@ async function start() {
   program.command("import-translation <dir> [dirs...]").description(
     "Imports a translation from the given directory into the database."
   ).option("--overwrite", "Whether to overwrite existing files.").action(async (dir, dirs, options) => {
-    await importTranslation(dir, dirs, options);
+    await importTranslation(dir, dirs, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("import-translations <dir>").description(
     "Imports all translations from the given directory into the database."
   ).option("--overwrite", "Whether to overwrite existing files.").action(async (dir, options) => {
-    await importTranslations2(dir, options);
+    await importTranslations2(dir, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("import-commentary <dir> [dirs...]").description(
     "Imports a commentary from the given directory into the database."
   ).option("--overwrite", "Whether to overwrite existing files.").action(async (dir, dirs, options) => {
-    await importCommentary(dir, dirs, options);
+    await importCommentary(dir, dirs, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("import-commentaries <dir>").description(
     "Imports all commentaries from the given directory into the database."
   ).option("--overwrite", "Whether to overwrite existing files.").action(async (dir, options) => {
-    await importCommentaries2(dir, options);
+    await importCommentaries2(dir, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("upload-test-translation <input>").description(
     `Uploads a translation to the HelloAO Free Bible API test S3 bucket.
@@ -15805,7 +15844,10 @@ For inquiries, please contact hello@helloao.org.`
     if (!good) {
       return;
     }
-    const result = await uploadTestTranslation(input5, options);
+    const result = await uploadTestTranslation(input5, {
+      ...program.opts(),
+      ...options
+    });
     if (result) {
       const logger2 = log_exports.getLogger();
       logger2.log("\n");
@@ -15865,7 +15907,10 @@ For inquiries, please contact hello@helloao.org.`
     if (!good) {
       return;
     }
-    const result = await uploadTestTranslations(input5, options);
+    const result = await uploadTestTranslations(input5, {
+      ...program.opts(),
+      ...options
+    });
     if (result) {
       const logger2 = log_exports.getLogger();
       logger2.log("\nVersion:             ", result.version);
@@ -15909,7 +15954,10 @@ For inquiries, please contact hello@helloao.org.`
     "--s3-region <region>",
     "The AWS region to use for uploading to S3."
   ).option("--pretty", "Whether to generate pretty-printed JSON files.").action(async (input5, dest, options) => {
-    await generateTranslationFiles(input5, dest, options);
+    await generateTranslationFiles(input5, dest, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("generate-translations-files <input> <dir>").description("Generates API files from the given input translations.").option(
     "--batch-size <size>",
@@ -15943,7 +15991,10 @@ For inquiries, please contact hello@helloao.org.`
     "--s3-region <region>",
     "The AWS region to use for uploading to S3."
   ).option("--pretty", "Whether to generate pretty-printed JSON files.").action(async (input5, dest, options) => {
-    await generateTranslationsFiles(input5, dest, options);
+    await generateTranslationsFiles(input5, dest, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("upload-api-files").argument("<dest>", "The destination to upload the API files to.").description(
     "Uploads API files to the specified destination. For S3, use the format s3://bucket-name/path/to/folder."
@@ -15985,7 +16036,7 @@ For inquiries, please contact hello@helloao.org.`
     "--verbose",
     "Whether to output verbose information during the upload."
   ).action(async (dest, options) => {
-    const db = getPrismaDbFromDir(process.cwd());
+    const db = getPrismaDb(program.opts().db);
     try {
       await uploadApiFilesFromDatabase(db, dest, options);
     } finally {
@@ -16010,7 +16061,10 @@ For inquiries, please contact hello@helloao.org.`
         overwrite: options.overwrite
       }
     };
-    await sourceTranslations(dir, translations, sourceOptions);
+    await sourceTranslations(dir, translations, {
+      ...program.opts(),
+      ...sourceOptions
+    });
   });
   program.command("list-ebible-translations [search]").description(
     "List available eBible translations. Optionally filter by search term."
@@ -16023,7 +16077,10 @@ For inquiries, please contact hello@helloao.org.`
     "-a, --all",
     "Fetch all translations. If omitted, only undownloaded translations will be fetched."
   ).action(async (dir, translations, options) => {
-    await fetchAudio(dir, translations, options);
+    await fetchAudio(dir, translations, {
+      ...program.opts(),
+      ...options
+    });
   });
   program.command("fetch-bible-metadata <dir>").description(
     "Fetches the Theographic bible metadata and places it in the given directory."

package/dist/cjs/index.cjs

@@ -5746,11 +5746,10 @@ var db_exports = {};
 __export(db_exports, {
   getChangedOrNewInputFiles: () => getChangedOrNewInputFiles,
   getDb: () => getDb,
-  getDbFromDir: () => getDbFromDir,
   getDbPath: () => getDbPath,
   getDbPathFromDir: () => getDbPathFromDir,
   getMigrationsPath: () => getMigrationsPath,
-  getPrismaDbFromDir: () => getPrismaDbFromDir,
+  getPrismaDb: () => getPrismaDb,
   importCommentaries: () => importCommentaries,
   importFileBatch: () => importFileBatch,
   importFiles: () => importFiles,
@@ -6886,14 +6885,16 @@ function getBookId(book) {
   return null;
 }
 var KNOWN_SKIPPED_VERSES = /* @__PURE__ */ new Set([
+  "MAT 12:47",
   "MAT 17:21",
   "MAT 18:11",
   "MAT 23:14",
-  "MAR 7:16",
-  "MAR 9:44",
-  "MAR 9:46",
-  "MAR 11:26",
+  "MRK 7:16",
+  "MRK 9:44",
+  "MRK 9:46",
+  "MRK 11:26",
   "LUK 17:36",
+  "LUK 23:17",
   "JHN 5:4",
   "ACT 8:37",
   "ACT 15:34",
@@ -12432,19 +12433,23 @@ function generateApiForDataset(dataset, options = {}) {
     };
     let translationChapters = [];
     for (let { chapters, ...book } of books) {
+      const firstChapterNumber = chapters[0].chapter.number;
+      const lastChapterNumber = chapters[chapters.length - 1].chapter.number;
       const apiBook = {
         ...book,
+        firstChapterNumber,
         firstChapterApiLink: bookChapterApiLink(
           translation.id,
           getBookLink(book),
-          1,
+          firstChapterNumber,
           "json",
           apiPathPrefix
         ),
+        lastChapterNumber,
         lastChapterApiLink: bookChapterApiLink(
           translation.id,
           getBookLink(book),
-          chapters.length,
+          lastChapterNumber,
           "json",
           apiPathPrefix
         ),
@@ -12569,22 +12574,26 @@ function generateApiForDataset(dataset, options = {}) {
     };
     let commentaryChapters = [];
     for (let { chapters, ...book } of books) {
+      const firstChapterNumber = chapters[0]?.chapter.number ?? null;
+      const lastChapterNumber = chapters[chapters.length - 1]?.chapter.number ?? null;
       const apiBook = {
         ...book,
-        firstChapterApiLink: bookCommentaryChapterApiLink(
+        firstChapterNumber,
+        firstChapterApiLink: firstChapterNumber ? bookCommentaryChapterApiLink(
           commentary.id,
           getBookLink(book),
-          1,
+          firstChapterNumber,
           "json",
           apiPathPrefix
-        ),
-        lastChapterApiLink: bookCommentaryChapterApiLink(
+        ) : null,
+        lastChapterNumber,
+        lastChapterApiLink: lastChapterNumber ? bookCommentaryChapterApiLink(
           commentary.id,
           getBookLink(book),
-          chapters.length,
+          lastChapterNumber,
           "json",
           apiPathPrefix
-        ),
+        ) : null,
         numberOfChapters: chapters.length,
         totalNumberOfVerses: 0
       };
@@ -13956,8 +13965,9 @@ function getDbPath(p) {
   }
   return getDbPathFromDir(process.cwd());
 }
-function getPrismaDbFromDir(dir) {
-  const dbPath = getDbPathFromDir(dir);
+function getPrismaDb(path5) {
+  const dbPath = getDbPath(path5);
+  console.log("Opening database at", dbPath);
   const prisma = new import_prisma_gen.PrismaClient({
     datasources: {
       db: {
@@ -13967,12 +13977,13 @@ function getPrismaDbFromDir(dir) {
   });
   return prisma;
 }
-async function getDbFromDir(dir) {
-  const dbPath = getDbPathFromDir(dir);
-  const db = await getDb(dbPath);
+async function getDb(path5) {
+  const dbPath = getDbPath(path5);
+  const db = await getDbFromPath(dbPath);
   return db;
 }
-async function getDb(dbPath) {
+async function getDbFromPath(dbPath) {
+  console.log("Opening database at", dbPath);
   const logger2 = log_exports.getLogger();
   const migrationsPath = await getMigrationsPath();
   if (!migrationsPath) {
@@ -15029,7 +15040,7 @@ async function initDb(dbPath, options) {
       }
     }
   } else {
-    const db = await getDb(getDbPath(dbPath));
+    const db = await getDb(dbPath);
     db.close();
   }
 }
@@ -15038,7 +15049,7 @@ async function importTranslation(dir, dirs, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     await importTranslations(
       db,
@@ -15056,7 +15067,7 @@ async function importTranslations2(dir, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     const files = await (0, import_promises5.readdir)(dir);
     const translationDirs = files.map((f) => import_node_path2.default.resolve(dir, f));
@@ -15076,7 +15087,7 @@ async function importCommentary(dir, dirs, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     await importCommentaries(
       db,
@@ -15094,7 +15105,7 @@ async function importCommentaries2(dir, options) {
   globalThis.DOMParser = import_linkedom.DOMParser;
   globalThis.Element = import_linkedom.Element;
   globalThis.Node = import_linkedom.Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     const files = await (0, import_promises5.readdir)(dir);
     const commentaryDirs = files.map((f) => import_node_path2.default.resolve(dir, f));
@@ -15265,7 +15276,7 @@ Found ${sources.length} sources for '${translationQuery}':`);
 }
 async function sourceTranslations(outputDir, translations, options = {}) {
   const logger2 = log_exports.getLogger();
-  const {
+  let {
     convertToUsx3 = false,
     useDatabase = true,
     // Default to true
@@ -15300,20 +15311,27 @@ async function sourceTranslations(outputDir, translations, options = {}) {
   let db = null;
   let sourceExists = null;
   let sourceUpsert = null;
-  let skippedByDatabase = 0;
   if (useDatabase) {
+    if (!overwrite) {
+      overwrite = true;
+      console.warn(
+        "Overwriting files is enabled due to database tracking."
+      );
+    }
     logger2.log("Connecting to database for download tracking...");
-    db = await getDbFromDir(process.cwd());
+    db = await getDb(options.db);
     sourceExists = db.prepare(
       "SELECT usfmZipEtag, usfmDownloadDate FROM EBibleSource WHERE id = @id AND sha256 = @sha256;"
     );
+    let skippedByDatabase = 0;
+    let sourcesChecked = 0;
+    let notDownloaded = 0;
     filteredSources = filteredSources.filter((source) => {
-      if (overwrite) {
-        return true;
-      }
       const existingSource = sourceExists.get(source);
+      sourcesChecked++;
       if (existingSource) {
         if (!existingSource.usfmDownloadDate) {
+          notDownloaded++;
           return true;
         }
         source.usfmZipEtag = existingSource.usfmZipEtag;
@@ -15328,13 +15346,18 @@ async function sourceTranslations(outputDir, translations, options = {}) {
     });
     if (skippedByDatabase > 0) {
       logger2.log(
-        `Database filtering: Skipped ${skippedByDatabase} already downloaded sources`
+        `Database filtering: Skipped ${skippedByDatabase} already downloaded sources.`
       );
     } else {
-      logger2.log(
-        "Database filtering: No sources were skipped (none previously downloaded)"
-      );
+      logger2.log(`Database filtering: No sources were skipped.`);
     }
+    logger2.log(`Database filtering:`);
+    logger2.log(`   \u2022 Checked: ${sourcesChecked}`);
+    logger2.log(`   \u2022 Skipped: ${skippedByDatabase}`);
+    logger2.log(`   \u2022 New: ${notDownloaded}`);
+    logger2.log(
+      `   \u2022 Needs Update: ${filteredSources.length - notDownloaded}`
+    );
     sourceUpsert = db.prepare(`INSERT INTO EBibleSource(
             id, translationId, title, shortTitle, languageCode, textDirection, copyright, description,
             oldTestamentBooks, oldTestamentChapters, oldTestamentVerses,
@@ -15541,9 +15564,9 @@ Total selected: ${selectedSources.length} sources from ${sourceGroups.size} tran
             if (!convertToUsx3) {
               source.usfmDownloadDate = import_luxon2.DateTime.utc().toISO();
               source.usfmDownloadPath = outputDir;
-            }
-            if (sourceUpsert) {
-              sourceUpsert.run(source);
+              if (sourceUpsert) {
+                sourceUpsert.run(source);
+              }
             }
           } catch (error) {
             numErrored++;