ultimate-jekyll-manager 0.0.39 → 0.0.41

package/README.md

@@ -76,6 +76,7 @@ npx uj audit
 ```bash
 GH_TOKEN=XXX \
 GITHUB_REPOSITORY=XXX \
+UJ_TRANSLATION_CACHE=true \
 npx uj translation
 ```
 <!-- Developing -->

package/dist/commands/audit.js

@@ -11,5 +11,5 @@ module.exports = async function (options) {
   // Log
   logger.log(`Starting audit...`);
 
-  await execute('UJ_FORCE_AUDIT=true bundle exec npm run gulp -- audit', { log: true })
+  await execute('UJ_AUDIT_FORCE=true bundle exec npm run gulp -- audit', { log: true })
 };

package/dist/commands/translation.js

@@ -11,5 +11,5 @@ module.exports = async function (options) {
   // Log
   logger.log(`Starting translation...`);
 
-  await execute('UJ_FORCE_TRANSLATION=true bundle exec npm run gulp -- translation', { log: true })
+  await execute('UJ_TRANSLATION_FORCE=true bundle exec npm run gulp -- translation', { log: true })
 };

package/dist/defaults/dist/_layouts/placeholder/test/translation.md

@@ -44,3 +44,11 @@ By vising {{ brand }}, you agree to comply.
 - Account page: [/account](/account)
 - Admin page: [/admin](/admin)
 - Admin sub-page: [/admin/subpage](/admin/subpage)
+
+## This is an input
+<div class="form-group">
+  <input type="email" name="slap_honey" class="form-control" placeholder="Your Email">
+</div>
+
+## This button has a title
+<a href="https://itwcreativeworks.com" class="btn btn-primary" title="Visit ITW Creative Works">Visit ITW Creative Works</a>

package/dist/gulp/tasks/audit.js

@@ -35,8 +35,8 @@ async function audit(complete) {
   // Log
   logger.log('Starting...');
 
-  // Quit if NOT in build mode and UJ_FORCE_AUDIT is not true
-  if (!Manager.isBuildMode() && process.env.UJ_FORCE_AUDIT !== 'true') {
+  // Quit if NOT in build mode and UJ_AUDIT_FORCE is not true
+  if (!Manager.isBuildMode() && process.env.UJ_AUDIT_FORCE !== 'true') {
     logger.log('Skipping audit in development mode');
     return complete();
   }

package/dist/gulp/tasks/defaults.js

@@ -232,7 +232,7 @@ function defaultsWatcher(complete) {
   // Watch for changes
   watch(input, { delay: delay, dot: true }, defaults)
   .on('change', (path) => {
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
   });
 
   // Complete

package/dist/gulp/tasks/developmentRebuild.js

@@ -91,7 +91,7 @@ function developmentRebuildWatcher(complete) {
   // Watch for changes
   watch(input, { delay: delay, dot: true }, developmentRebuild)
   .on('change', (path) => {
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
   });
 
   // Complete

package/dist/gulp/tasks/distribute.js

@@ -102,7 +102,7 @@ function distributeWatcher(complete) {
   // Watch for changes
   watch(input, { delay: delay, dot: true }, distribute)
   .on('change', (path) => {
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
   });
 
   // Complete

package/dist/gulp/tasks/imagemin.js

@@ -130,7 +130,7 @@ function imageminWatcher(complete) {
   // Watch for changes
   watch(input, { delay: delay, dot: true }, imagemin)
   .on('change', (path) => {
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
   });
 
   // Complete

package/dist/gulp/tasks/jekyll.js

@@ -79,9 +79,6 @@ async function jekyll(complete) {
   // Run buildpost hook
   await hook('build:post', index);
 
-  // QUIT
-  // QUIT
-
   // Log
   logger.log('Finished!');
 
@@ -113,7 +110,7 @@ function jekyllWatcher(complete) {
   // Watch for changes
   watch(input, { delay: delay, dot: true }, jekyll)
   .on('change', (path) => {
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
 
     // Check if changed file is a .rb file
     if (path.endsWith('.rb')) {

package/dist/gulp/tasks/sass.js

@@ -113,7 +113,7 @@ function sassWatcher(complete) {
   // Watch for changes
   watch(input, { delay: delay, dot: true }, sass)
   .on('change', (path) => {
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
   });
 
   // Complete

package/dist/gulp/tasks/translation.js

@@ -1,7 +1,7 @@
 // Libraries
 const Manager = new (require('../../build.js'));
 const logger = Manager.logger('translation');
-const { series } = require('gulp');
+const { series, watch } = require('gulp');
 const glob = require('glob').globSync;
 const path = require('path');
 const fetch = require('wonderful-fetch');
@@ -9,7 +9,7 @@ const jetpack = require('fs-jetpack');
 const cheerio = require('cheerio');
 const crypto = require('crypto');
 const yaml = require('js-yaml');
-const { execute, wait } = require('node-powertools');
+const { execute, wait, template } = require('node-powertools');
 const { Octokit } = require('@octokit/rest')
 const AdmZip = require('adm-zip') // npm install adm-zip
 
@@ -38,13 +38,29 @@ const RECHECK_DAYS = 0;
 // const AI_MODEL = 'gpt-4.1-nano';
 const AI_MODEL = 'gpt-4.1-mini';
 const TRANSLATION_BRANCH = 'uj-translations';
-const LOUD = false;
-// const LOUD = true;
+// const LOUD = false;
+const LOUD = process.env.UJ_LOUD_LOGS === 'true';
+const CONTROL = 'UJ-TRANSLATION-CONTROL';
 
 const TRANSLATION_DELAY_MS = 500; // wait between each translation
 const TRANSLATION_BATCH_SIZE = 25; // wait longer every N translations
 const TRANSLATION_BATCH_DELAY_MS = 10000; // longer wait after batch
 
+// Prompt
+const SYSTEM_PROMPT = `
+  You are a professional translator.
+  Translate the provided content, preserving all original formatting, HTML structure, metadata, and links.
+  Do not explain anything — just return the translated content.
+  The content is TAGGED with [0]...[/0], etc. to mark the text. You MUST KEEP THESE TAGS IN PLACE IN YOUR RESPONSE and OPEN ([0]) and CLOSE ([/0]) them PROPERLY.
+
+  DO NOT translate the following elements (but still keep them in place):
+  - URLs or other non-text elements.
+  - the brand name ({brand}).
+  - the control tag (${CONTROL}).
+
+  Translate to {lang}
+`;
+
 // Variables
 let octokit;
 
@@ -61,11 +77,8 @@ async function translation(complete) {
   // Log
   logger.log('Starting...');
 
-  // Get ignored pages
-  const ignoredPages = getIgnoredPages();
-
-  // Quit if NOT in build mode and UJ_FORCE_TRANSLATION is not true
-  if (!Manager.isBuildMode() && process.env.UJ_FORCE_TRANSLATION !== 'true') {
+  // Quit if NOT in build mode and UJ_TRANSLATION_FORCE is not true
+  if (!Manager.isBuildMode() && process.env.UJ_TRANSLATION_FORCE !== 'true') {
     logger.log('Skipping translation in development mode');
     return complete();
   }
@@ -103,6 +116,34 @@ async function translation(complete) {
   return complete();
 };
 
+// TODO: Currently this does not work because it will run an infinite loop
+function translationWatcher(complete) {
+  // Quit if in build mode
+  if (Manager.isBuildMode()) {
+    logger.log('[watcher] Skipping watcher in build mode');
+    return complete();
+  }
+
+  // Log
+  logger.log('[watcher] Watching for changes...');
+
+  // Get ignored pages
+  const ignoredPages = getIgnoredPages();
+  const ignore = [
+    ...ignoredPages.files.map(key => `_site/${key}.html`),
+    ...ignoredPages.folders.map(folder => `_site/${folder}/**/*`)
+  ]
+
+  // Watch for changes
+  watch(input, { delay: delay, ...getGlobOptions(), }, translation)
+  .on('change', (path) => {
+    logger.log(`[watcher] File changed (${path})`);
+  });
+
+  // Complete
+  return complete();
+}
+
 // Default Task
 module.exports = series(translation);
 
@@ -110,7 +151,6 @@ module.exports = series(translation);
 async function processTranslation() {
   const enabled = config?.translation?.enabled !== false;
   const languages = config?.translation?.languages || [];
-  const ignoredPages = getIgnoredPages();
   const updatedFiles = new Set();
 
   // Quit if translation is disabled or no languages are configured
@@ -135,13 +175,7 @@ async function processTranslation() {
   // }
 
   // Get files
-  const allFiles = glob(input, {
-    nodir: true,
-    ignore: [
-      ...ignoredPages.files.map(key => `_site/${key}.html`),
-      ...ignoredPages.folders.map(folder => `_site/${folder}/**/*`)
-    ]
-  });
+  const allFiles = glob(input, getGlobOptions());
 
   // Log
   logger.log(`Translating ${allFiles.length} files for ${languages.length} supported languages: ${languages.join(', ')}`);
@@ -153,6 +187,8 @@ async function processTranslation() {
       skipped: new Set(),
     }
   };
+  const promptHash = crypto.createHash('sha256').update(SYSTEM_PROMPT).digest('hex');
+
   for (const lang of languages) {
     const metaPath = path.join(CACHE_DIR, lang, 'meta.json');
     let meta = {};
@@ -163,6 +199,15 @@ async function processTranslation() {
         logger.warn(`⚠️ Failed to parse meta for [${lang}], starting fresh`);
       }
     }
+
+    // Check if the promptHash matches; if not, invalidate the cache
+    if (meta.prompt?.hash !== promptHash) {
+      logger.warn(`⚠️ Prompt hash mismatch for [${lang}]. Invalidating cache.`);
+      meta = {};
+    }
+
+    // Store the current promptHash in the meta file
+    meta.prompt = { hash: promptHash };
     metas[lang] = { meta, path: metaPath, skipped: new Set() };
   }
 
@@ -173,9 +218,16 @@ async function processTranslation() {
   for (const filePath of allFiles) {
     // Get relative path and original HTML
     const relativePath = filePath.replace(/^_site[\\/]/, '');
-    const originalHtml = jetpack.read(filePath);
+    let originalHtml = jetpack.read(filePath);
     const $ = cheerio.load(originalHtml);
 
+    // Inject hidden control tag as last child of <body>
+    const controlTag = `<span id="${CONTROL}" style="display:none;">${CONTROL}</span>`;
+    $('body').append(controlTag);
+
+    // Reset originalHtml
+    originalHtml = $.html();
+
     // Collect text nodes with tags
     const textNodes = collectTextNodes($, { tag: true });
 
@@ -217,11 +269,30 @@ async function processTranslation() {
         const age = entry?.timestamp
           ? (Date.now() - new Date(entry.timestamp).getTime()) / (1000 * 60 * 60 * 24)
           : Infinity;
-        const useCached = entry && entry.hash === hash && (RECHECK_DAYS === 0 || age < RECHECK_DAYS);
+        const useCached = entry
+          && entry.hash === hash
+          && (RECHECK_DAYS === 0 || age < RECHECK_DAYS);
         const startTime = Date.now();
 
+        function setResult(success) {
+          if (success) {
+            meta[relativePath] = {
+              timestamp: new Date().toISOString(),
+              hash,
+            };
+          } else {
+            meta[relativePath] = {
+              timestamp: 0,
+              hash: '__fail__',
+            };
+          }
+        }
+
         // Check if we can use cached translation
-        if (useCached && jetpack.exists(cachePath)) {
+        if (
+          (useCached || process.env.UJ_TRANSLATION_CACHE === 'true')
+          && jetpack.exists(cachePath)
+        ) {
           translated = jetpack.read(cachePath);
           logger.log(`📦 Using cached translation for ${relativePath} [${lang}]`);
         } else {
@@ -241,10 +312,9 @@ async function processTranslation() {
 
             // Save to cache
             jetpack.write(cachePath, translated);
-            meta[relativePath] = {
-              timestamp: new Date().toISOString(),
-              hash,
-            };
+
+            // Set result
+            setResult(true);
           } catch (e) {
             const elapsedTime = ((Date.now() - startTime) / 1000).toFixed(2);
             logger.error(`⚠️ Translation failed: ${relativePath} [${lang}] — ${e.message} (Elapsed time: ${elapsedTime}s)`);
@@ -253,10 +323,7 @@ async function processTranslation() {
             translated = bodyText;
 
             // Save failure to cache
-            meta[relativePath] = {
-              timestamp: 0,
-              hash: '__fail__',
-            };
+            setResult(false);
           }
         }
 
@@ -278,19 +345,41 @@ async function processTranslation() {
             return logger.warn(`⚠️ Could not find translated tag for index ${i}`);
           }
 
+          // Extract original leading and trailing whitespace
+          const originalText = n.text;
+          const leadingWhitespace = originalText.match(/^\s*/)?.[0] || '';
+          const trailingWhitespace = originalText.match(/\s*$/)?.[0] || '';
+
+          // Reapply the original whitespace to the translation
+          const adjustedTranslation = `${leadingWhitespace}${translation.trim()}${trailingWhitespace}`;
+
           if (n.type === 'data') {
-            n.reference.data = translation;
+            n.reference.data = adjustedTranslation;
           } else if (n.type === 'text') {
-            n.node.text(translation);
+            n.node.text(adjustedTranslation);
           } else if (n.type === 'attr') {
-            n.node.attr(n.attr, translation);
+            n.node.attr(n.attr, adjustedTranslation);
           }
-          if (LOUD) logger.log(`${i}: ${n.text} → ${translation}`);
+          if (LOUD) logger.log(`${i}: "${n.text.trim()}" → "${adjustedTranslation.trim()}"`);
         });
 
         // Rewrite links
         rewriteLinks($, lang);
 
+        // Check that the control tag matches the expected value
+        const controlTag = $(`#${CONTROL}`);
+        if (
+          controlTag.length === 0
+          || controlTag.text() !== CONTROL
+        ) {
+          logger.error(`⚠️ Control tag mismatch in ${relativePath} [${lang}]`);
+
+          return setResult(false);
+        } else {
+          // Delete the control tag
+          controlTag.remove();
+        }
+
         // Set the lang attribute on the <html> tag
         $('html').attr('lang', lang);
 
@@ -377,19 +466,16 @@ async function processTranslation() {
 
   // Push updated translation cache back to uj-translations
   if (Manager.isBuildMode()) {
-    await pushTranslationBranch(updatedFiles);
+    await pushTranslationBranch( );
   }
 }
 
 async function translateWithAPI(openAIKey, content, lang) {
-  // Prompt
-  const systemPrompt = `
-    You are a professional translator.
-    Translate the provided content, preserving all original formatting, HTML structure, metadata, and links.
-    Do not explain anything — just return the translated content.
-    The content is TAGGED with [0]...[/0], etc. to mark the text. You MUST KEEP THESE TAGS IN PLACE IN YOUR RESPONSE and OPEN ([0]) and CLOSE ([/0]) them PROPERLY.
-    Translate to ${lang}.
-  `;
+  const brand = config?.brand?.name || 'Unknown Brand';
+  const systemPrompt = template(SYSTEM_PROMPT, {
+    lang,
+    brand
+  });
 
   // Request
   const res = await fetch('https://api.openai.com/v1/chat/completions', {
@@ -550,9 +636,6 @@ async function insertLanguageTags($, languages, relativePath, filePath) {
     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);
   }
@@ -628,6 +711,17 @@ function getIgnoredPages() {
   };
 }
 
+function getGlobOptions() {
+  const ignoredPages = getIgnoredPages();
+  return {
+    nodir: true,
+    ignore: [
+      ...ignoredPages.files.map(key => `_site/${key}.html`),
+      ...ignoredPages.folders.map(folder => `_site/${folder}/**/*`)
+    ]
+  }
+}
+
 // Git Sync: Pull
 async function fetchTranslationsBranch() {
   const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/')
@@ -724,7 +818,7 @@ async function fetchTranslationsBranch() {
 }
 
 // Git Sync: Push
-async function pushTranslationBranch(updatedFiles) {
+async function pushTranslationBranch( ) {
   const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/');
   const localRoot = path.join('.temp', 'translations');
 

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

@@ -21,14 +21,14 @@ const collectTextNodes = ($, options) => {
       const i = textNodes.length;
       const text = node.text().trim();
       if (text) {
+
+        // Push
         textNodes.push({
           node,
           type: 'text',
           attr: null,
           text,
           tagged: `[${i}]${text}[/${i}]`,
-          line: el.startIndex || 0, // Add line information
-          column: 0 // Column is not directly available, default to 0
         });
       }
       return;
@@ -51,29 +51,51 @@ const collectTextNodes = ($, options) => {
         const text = node.attr('content')?.trim();
         if (text) {
           const i = textNodes.length;
+
+          // Push
           textNodes.push({
             node,
             type: 'attr',
             attr: 'content',
             text,
             tagged: `[${i}]${text}[/${i}]`,
-            line: el.startIndex || 0, // Add line information
-            column: 0 // Column is not directly available, default to 0
           });
         }
       }
       return;
     }
 
+    // Handle attributes like title and placeholder
+    const translatableAttributes = ['title', 'placeholder', 'alt', 'aria-label', 'aria-placeholder', 'aria-describedby', 'aria-labelledby', 'value', 'label'];
+    translatableAttributes.forEach(attr => {
+      const text = node.attr(attr)?.trim();
+      if (text) {
+        const i = textNodes.length;
+
+        // Push
+        textNodes.push({
+          node,
+          type: 'attr',
+          attr,
+          text,
+          tagged: `[${i}]${text}[/${i}]`,
+        });
+      }
+    });
+
     // Handle regular DOM text nodes
     node.contents().each((_, child) => {
       if (child.type === 'text' && child.data?.trim()) {
         const i = textNodes.length;
         const text = child.data
-          .replace(/^\s+/, '')
-          .replace(/\s+$/, '')
+          // Preserve a single leading whitespace if it exists
+          .replace(/^\s*(\s)\s*/, '$1')
+          // Preserve a single trailing whitespace if it exists
+          .replace(/\s*(\s)\s*$/, '$1')
+          // Normalize internal whitespace
           .replace(/\s+/g, ' ');
 
+        // Push
         textNodes.push({
           node,
           type: 'data',
@@ -81,8 +103,6 @@ const collectTextNodes = ($, options) => {
           reference: child,
           text,
           tagged: `[${i}]${text}[/${i}]`,
-          line: el.startIndex || 0, // Add line information
-          column: 0 // Column is not directly available, default to 0
         });
       }
     });
@@ -92,3 +112,12 @@ const collectTextNodes = ($, options) => {
 };
 
 module.exports = collectTextNodes;
+
+
+function trimPreserveOneCleanInner(str) {
+  const match = str.match(/^(\s*)(.*?)(\s*)$/);
+  const leading = match[1] ? match[1][0] || '' : '';
+  const content = match[2].replace(/\s+/g, ' ');
+  const trailing = match[3] ? match[3][0] || '' : '';
+  return leading + content + trailing;
+}

package/dist/gulp/tasks/webpack.js

@@ -186,7 +186,7 @@ function webpackWatcher(complete) {
   watch(input, { delay: delay, dot: true }, webpack)
   .on('change', (path) => {
     // Log
-    logger.log(`[watcher] File ${path} was changed`);
+    logger.log(`[watcher] File changed (${path})`);
   });
 
   // Complete

package/package.json

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