ultimate-jekyll-manager 0.0.38 → 0.0.39

package/dist/gulp/tasks/audit.js

@@ -72,10 +72,15 @@ async function validateFormat(file, content) {
     (async () => {
       try {
         // Format the content using Prettier
-        const formatted = await formatDocument(content, format, true);
+        const formatted = await formatDocument(content, format);
 
         // Save the formatted content back to the file
-        jetpack.write(file, formatted);
+        jetpack.write(file, formatted.content);
+
+        // Quit if there is an error
+        if (formatted.error) {
+          throw formatted.error;
+        }
 
         return { valid: true, messages: [] };
       } catch (e) {

package/dist/gulp/tasks/translation.js

@@ -148,7 +148,11 @@ async function processTranslation() {
   // logger.log(allFiles);
 
   // Prepare meta caches per language
-  const metas = {};
+  const metas = {
+    global: {
+      skipped: new Set(),
+    }
+  };
   for (const lang of languages) {
     const metaPath = path.join(CACHE_DIR, lang, 'meta.json');
     let meta = {};
@@ -159,7 +163,7 @@ async function processTranslation() {
         logger.warn(`⚠️ Failed to parse meta for [${lang}], starting fresh`);
       }
     }
-    metas[lang] = { meta, path: metaPath, skipped: [] };
+    metas[lang] = { meta, path: metaPath, skipped: new Set() };
   }
 
   // Track token usage
@@ -183,9 +187,8 @@ async function processTranslation() {
 
     // Skip all except the specified HTML file
     if (ujOnly && relativePath !== ujOnly) {
-      for (const lang of languages) {
-        metas[lang].skipped.push(`${relativePath} (UJ_TRANSLATION_ONLY set)`);
-      }
+      // Update to work with the new SET protocol
+      metas.global.skipped.add(`${relativePath} (UJ_TRANSLATION_ONLY set)`);
       continue;
     }
 
@@ -260,6 +263,11 @@ async function processTranslation() {
         // Log result
         // console.log('---translated---', translated);
 
+        // Reset the DOM to avoid conflicts between languages
+        const $ = cheerio.load(originalHtml);
+        // Collect text nodes with tags
+        const textNodes = collectTextNodes($, { tag: true });
+
         // Replace original text nodes with translated versions
         textNodes.forEach((n, i) => {
           const regex = new RegExp(`\\[${i}\\](.*?)\\[/${i}\\]`, 's');
@@ -294,7 +302,7 @@ async function processTranslation() {
         $('meta[property="og:url"]').attr('content', canonicalUrl);
 
         // Insert language tags on this translation
-        await insertLanguageTags($, languages, relativePath);
+        await insertLanguageTags($, languages, relativePath, outPath);
 
         // Insert language tags in original file
         await insertLanguageTags(cheerio.load(originalHtml), languages, relativePath, filePath);
@@ -305,7 +313,15 @@ async function processTranslation() {
         await insertLanguageTags(cheerio.load(sitemapXml, { xmlMode: true }), languages, relativePath, sitemapPath);
 
         // Save output
-        jetpack.write(outPath, await formatDocument($.html(), undefined, false));
+        // const formatted = await formatDocument($.html(), 'html');
+
+        // console.log('----relativePath', relativePath);
+        // console.log('----filePath', filePath);
+        // console.log('----outPath', outPath);
+        // console.log('----FORMATTED.ERROR', formatted.error);
+
+        // Write the translated file
+        // jetpack.write(outPath, formatted.content);
         // logger.log(`✅ Wrote: ${outPath}`);
 
         // Track updated files only if it's new or updated
@@ -334,13 +350,23 @@ async function processTranslation() {
     }
   }
 
+  // Log skipped files
+  logger.warn('🚫 Skipped files:');
+  let totalSkipped = 0;
+  for (const [lang, meta] of Object.entries(metas)) {
+    if (meta.skipped.size > 0) {
+      logger.warn(`  [${lang}] ${meta.skipped.size} skipped files:`);
+      meta.skipped.forEach(f => logger.warn(`    ${f}`));
+      totalSkipped += meta.skipped.size;
+    }
+  }
+  if (totalSkipped === 0) {
+    logger.warn('  NONE');
+  }
+
   // Save all updated meta files
   for (const lang of languages) {
     jetpack.write(metas[lang].path, metas[lang].meta);
-    if (metas[lang].skipped.length) {
-      logger.warn('🚫 Skipped files:');
-      metas[lang].skipped.forEach(f => logger.warn(f));
-    }
   }
 
   // Log total token usage
@@ -521,9 +547,14 @@ async function insertLanguageTags($, languages, relativePath, filePath) {
 
   // Save the modified HTML back to the file if filePath
   if (filePath) {
-    // const format = isHtml ? 'html' : 'xml';
-    const format = 'html';
-    jetpack.write(filePath, await formatDocument($.html(), format));
+    const format = isHtml ? 'html' : 'xml';
+    const formatted = await formatDocument($.html(), format);
+
+    console.log('---SAVING filePath', filePath);
+    console.log('---SAVING formatted.error', formatted.error);
+
+    // Write the formatted content back to the file
+    jetpack.write(filePath, formatted.content);
   }
 }
 

package/dist/gulp/tasks/utils/formatDocument.js

@@ -6,10 +6,9 @@ const path = require('path');
 // Load package
 const rootPathPackage = Manager.getRootPath('main');
 
-module.exports = async function formatHTML(content, format, throwError) {
+module.exports = async (content, format) => {
   // Set default format to 'html' if not provided
   format = format || 'html';
-  throwError = typeof throwError === 'undefined' ? true : throwError;
 
   // Setup Prettier options
   const options = {
@@ -30,16 +29,19 @@ module.exports = async function formatHTML(content, format, throwError) {
   return prettier
     .format(content, options)
     .then((formatted) => {
-      return removeMultipleNewlines(formatted);
+      return {
+        content: removeMultipleNewlines(formatted),
+        error: null,
+      };
     })
     .catch((e) => {
-      if (throwError) {
-        throw e;
-      }
-      return removeMultipleNewlines(content);
+      return {
+        content: removeMultipleNewlines(content),
+        error: e,
+      };
     });
 };
 
 function removeMultipleNewlines(content) {
-  return content.replace(/\n\s*\n+/g, '\n');
+  return content.replace(/\n\s*\n+/g, '\n').trim();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {