@helloao/cli 0.0.13 → 0.0.14

package/dist/esm/index.js

@@ -5738,11 +5738,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,
@@ -6954,8 +6953,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: {
@@ -6965,12 +6965,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 logger = log2.getLogger();
   const migrationsPath = await getMigrationsPath();
   if (!migrationsPath) {
@@ -8042,7 +8043,7 @@ async function initDb(dbPath, options) {
       }
     }
   } else {
-    const db = await getDb(getDbPath(dbPath));
+    const db = await getDb(dbPath);
     db.close();
   }
 }
@@ -8051,7 +8052,7 @@ async function importTranslation(dir, dirs, options) {
   globalThis.DOMParser = DOMParser;
   globalThis.Element = Element;
   globalThis.Node = Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     await importTranslations(
       db,
@@ -8069,7 +8070,7 @@ async function importTranslations2(dir, options) {
   globalThis.DOMParser = DOMParser;
   globalThis.Element = Element;
   globalThis.Node = Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     const files = await readdir4(dir);
     const translationDirs = files.map((f) => path4.resolve(dir, f));
@@ -8089,7 +8090,7 @@ async function importCommentary(dir, dirs, options) {
   globalThis.DOMParser = DOMParser;
   globalThis.Element = Element;
   globalThis.Node = Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     await importCommentaries(
       db,
@@ -8107,7 +8108,7 @@ async function importCommentaries2(dir, options) {
   globalThis.DOMParser = DOMParser;
   globalThis.Element = Element;
   globalThis.Node = Node;
-  const db = await getDbFromDir(process.cwd());
+  const db = await getDb(options.db);
   try {
     const files = await readdir4(dir);
     const commentaryDirs = files.map((f) => path4.resolve(dir, f));
@@ -8278,7 +8279,7 @@ Found ${sources.length} sources for '${translationQuery}':`);
 }
 async function sourceTranslations(outputDir, translations, options = {}) {
   const logger = log7.getLogger();
-  const {
+  let {
     convertToUsx3 = false,
     useDatabase = true,
     // Default to true
@@ -8313,20 +8314,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."
+      );
+    }
     logger.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;
@@ -8341,13 +8349,18 @@ async function sourceTranslations(outputDir, translations, options = {}) {
     });
     if (skippedByDatabase > 0) {
       logger.log(
-        `Database filtering: Skipped ${skippedByDatabase} already downloaded sources`
+        `Database filtering: Skipped ${skippedByDatabase} already downloaded sources.`
       );
     } else {
-      logger.log(
-        "Database filtering: No sources were skipped (none previously downloaded)"
-      );
+      logger.log(`Database filtering: No sources were skipped.`);
     }
+    logger.log(`Database filtering:`);
+    logger.log(`   \u2022 Checked: ${sourcesChecked}`);
+    logger.log(`   \u2022 Skipped: ${skippedByDatabase}`);
+    logger.log(`   \u2022 New: ${notDownloaded}`);
+    logger.log(
+      `   \u2022 Needs Update: ${filteredSources.length - notDownloaded}`
+    );
     sourceUpsert = db.prepare(`INSERT INTO EBibleSource(
             id, translationId, title, shortTitle, languageCode, textDirection, copyright, description,
             oldTestamentBooks, oldTestamentChapters, oldTestamentVerses,
@@ -8554,9 +8567,9 @@ Total selected: ${selectedSources.length} sources from ${sourceGroups.size} tran
             if (!convertToUsx3) {
               source.usfmDownloadDate = DateTime2.utc().toISO();
               source.usfmDownloadPath = outputDir;
-            }
-            if (sourceUpsert) {
-              sourceUpsert.run(source);
+              if (sourceUpsert) {
+                sourceUpsert.run(source);
+              }
             }
           } catch (error) {
             numErrored++;