@patch-adams/core 1.6.0 → 1.6.2

package/dist/cli.js

@@ -5630,18 +5630,21 @@ window.pa_patcher = window.pa_patcher || {
 
 (function() {
   'use strict';
-  // Fetch server-controlled cache version (sync, once)
-  var ASSET_VERSION_URL = "${assetVersionUrl || ""}";
-  window.__pa_v = '';
-  if (ASSET_VERSION_URL) {
-    try {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', ASSET_VERSION_URL, false);
-      xhr.send();
-      if (xhr.status === 200) {
-        window.__pa_v = JSON.parse(xhr.responseText).v || '1';
-      }
-    } catch(e) { window.__pa_v = '1'; }
+  // Cache version \u2014 normally set by version resolver (injected before CSS Before).
+  // Fallback: fetch here if version resolver didn't run (older patched packages).
+  if (typeof window.__pa_v === 'undefined') {
+    var ASSET_VERSION_URL = "${assetVersionUrl || ""}";
+    window.__pa_v = '';
+    if (ASSET_VERSION_URL) {
+      try {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', ASSET_VERSION_URL, false);
+        xhr.send();
+        if (xhr.status === 200) {
+          window.__pa_v = JSON.parse(xhr.responseText).v || '1';
+        }
+      } catch(e) { window.__pa_v = '1'; }
+    }
   }
 
   var REMOTE_URL = "${remoteUrl}" + (window.__pa_v ? "?v=" + window.__pa_v : "");
@@ -6024,6 +6027,7 @@ function hasClassMappings(mappings) {
   if (mappings.course?.trim()) return true;
   if (mappings.lessons && Object.values(mappings.lessons).some((v) => v?.trim())) return true;
   if (mappings.blocks && Object.values(mappings.blocks).some((v) => v?.trim())) return true;
+  if (mappings.blockGroups && mappings.blockGroups.length > 0) return true;
   return false;
 }
 function generateClassMappingsScript(mappings) {
@@ -6045,6 +6049,10 @@ function generateClassMappingsScript(mappings) {
   }
   const hasBlocks = Object.keys(blockMap).length > 0;
   const hasLessons = Object.keys(lessonMap).length > 0;
+  const blockGroups = (mappings.blockGroups || []).filter(
+    (g) => g.blockIds.length >= 2 && g.className.trim() && g.lessonId
+  );
+  const hasGroups = blockGroups.length > 0;
   const parts = [];
   parts.push(`// PA-Patcher: Custom Class Mappings`);
   parts.push(`(function() {`);
@@ -6110,33 +6118,117 @@ function generateClassMappingsScript(mappings) {
     parts.push(`  }`);
     parts.push(``);
   }
+  if (hasGroups) {
+    const groupData = blockGroups.map((g) => ({
+      id: g.id,
+      lessonId: g.lessonId,
+      blockIds: g.blockIds,
+      className: g.className.trim()
+    }));
+    parts.push(`  // Block groups (adjacent blocks wrapped in container divs)`);
+    parts.push(`  var groupMap = ${JSON.stringify(groupData)};`);
+    parts.push(``);
+    parts.push(`  function applyBlockGroups() {`);
+    parts.push(`    var hash = window.location.hash || '';`);
+    parts.push(`    var match = hash.match(/#\\/lessons\\/([^/]+)/);`);
+    parts.push(`    var currentLesson = match ? match[1] : null;`);
+    parts.push(`    for (var g = 0; g < groupMap.length; g++) {`);
+    parts.push(`      var group = groupMap[g];`);
+    parts.push(`      if (group.lessonId !== currentLesson) continue;`);
+    parts.push(`      if (document.querySelector('[data-pa-group-id="' + group.id + '"]')) continue;`);
+    parts.push(`      var blocks = [];`);
+    parts.push(`      var allPresent = true;`);
+    parts.push(`      for (var b = 0; b < group.blockIds.length; b++) {`);
+    parts.push(`        var el = document.querySelector('[data-block-id="' + group.blockIds[b] + '"]');`);
+    parts.push(`        if (!el) { allPresent = false; break; }`);
+    parts.push(`        blocks.push(el);`);
+    parts.push(`      }`);
+    parts.push(`      if (!allPresent) continue;`);
+    parts.push(`      var parent = blocks[0].parentNode;`);
+    parts.push(`      var sameParent = true;`);
+    parts.push(`      for (var s = 1; s < blocks.length; s++) {`);
+    parts.push(`        if (blocks[s].parentNode !== parent) { sameParent = false; break; }`);
+    parts.push(`      }`);
+    parts.push(`      if (!sameParent) continue;`);
+    parts.push(`      var wrapper = document.createElement('div');`);
+    parts.push(`      wrapper.setAttribute('data-pa-group-id', group.id);`);
+    parts.push(`      var cls = group.className.split(' ');`);
+    parts.push(`      for (var c = 0; c < cls.length; c++) {`);
+    parts.push(`        if (cls[c]) wrapper.classList.add(cls[c]);`);
+    parts.push(`      }`);
+    parts.push(`      parent.insertBefore(wrapper, blocks[0]);`);
+    parts.push(`      for (var m = 0; m < blocks.length; m++) {`);
+    parts.push(`        wrapper.appendChild(blocks[m]);`);
+    parts.push(`      }`);
+    parts.push(`    }`);
+    parts.push(`  }`);
+    parts.push(``);
+    parts.push(`  function teardownBlockGroups() {`);
+    parts.push(`    var wrappers = document.querySelectorAll('[data-pa-group-id]');`);
+    parts.push(`    for (var w = 0; w < wrappers.length; w++) {`);
+    parts.push(`      var wr = wrappers[w];`);
+    parts.push(`      var par = wr.parentNode;`);
+    parts.push(`      while (wr.firstChild) {`);
+    parts.push(`        par.insertBefore(wr.firstChild, wr);`);
+    parts.push(`      }`);
+    parts.push(`      par.removeChild(wr);`);
+    parts.push(`    }`);
+    parts.push(`  }`);
+    parts.push(``);
+  }
   parts.push(`  // Initialization`);
   parts.push(`  function init() {`);
   if (hasBlocks) {
     parts.push(`    applyBlockClasses();`);
   }
+  if (hasGroups) {
+    parts.push(`    applyBlockGroups();`);
+  }
   if (hasLessons) {
     parts.push(`    applyLessonClasses();`);
+  }
+  if (hasLessons || hasGroups) {
     parts.push(``);
     parts.push(`    // Watch for Rise SPA navigation`);
     parts.push(`    window.addEventListener('hashchange', function() {`);
-    parts.push(`      applyLessonClasses();`);
+    if (hasGroups) {
+      parts.push(`      teardownBlockGroups();`);
+    }
+    if (hasLessons) {
+      parts.push(`      applyLessonClasses();`);
+    }
     if (hasBlocks) {
       parts.push(`      setTimeout(applyBlockClasses, 200);`);
     }
+    if (hasGroups) {
+      parts.push(`      setTimeout(applyBlockGroups, 300);`);
+    }
     parts.push(`    });`);
   }
-  if (hasBlocks) {
+  if (hasBlocks || hasGroups) {
     parts.push(``);
     parts.push(`    // MutationObserver for lazily-rendered Rise blocks`);
-    parts.push(`    var observer = new MutationObserver(function(mutations) {`);
-    parts.push(`      for (var i = 0; i < mutations.length; i++) {`);
-    parts.push(`        if (mutations[i].addedNodes.length > 0) {`);
-    parts.push(`          applyBlockClasses();`);
-    parts.push(`          return;`);
-    parts.push(`        }`);
-    parts.push(`      }`);
-    parts.push(`    });`);
+    if (hasGroups) {
+      parts.push(`    var debounceTimer = null;`);
+      parts.push(`    var observer = new MutationObserver(function() {`);
+      parts.push(`      if (debounceTimer) clearTimeout(debounceTimer);`);
+      parts.push(`      debounceTimer = setTimeout(function() {`);
+      if (hasBlocks) {
+        parts.push(`        applyBlockClasses();`);
+      }
+      parts.push(`        applyBlockGroups();`);
+      parts.push(`      }, 100);`);
+      parts.push(`    });`);
+    } else {
+      parts.push(`    var observer = new MutationObserver(function(mutations) {`);
+      parts.push(`      for (var i = 0; i < mutations.length; i++) {`);
+      parts.push(`        if (mutations[i].addedNodes.length > 0) {`);
+      parts.push(`          applyBlockClasses();`);
+      parts.push(`          return;`);
+      parts.push(`        }`);
+      parts.push(`      }`);
+      parts.push(`    });`);
+    }
     parts.push(`    var container = document.querySelector('#app') || document.body;`);
     parts.push(`    observer.observe(container, { childList: true, subtree: true });`);
   }
@@ -6202,6 +6294,7 @@ var HtmlInjector = class {
   inject(html) {
     let result = html;
     result = this.addHtmlAttributes(result);
+    result = this.injectVersionResolver(result);
     if (this.config.cssBefore.enabled) {
       result = this.injectCssBefore(result);
     }
@@ -6305,6 +6398,20 @@ ${pluginJs}
   escapeAttr(str) {
     return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   }
+  /**
+   * Inject a tiny inline script that fetches the asset version BEFORE any loaders.
+   * Sets window.__pa_v so CSS Before, JS Before, and all other loaders get ?v= cache bust.
+   */
+  injectVersionResolver(html) {
+    const assetVersionUrl = this.config.assetVersionUrl || "";
+    if (!assetVersionUrl) return html;
+    const script = `<!-- === PATCH-ADAMS: VERSION RESOLVER === -->
+<script data-pa="version-resolver">
+(function(){try{var x=new XMLHttpRequest();x.open('GET','${assetVersionUrl}',false);x.send();if(x.status===200){window.__pa_v=JSON.parse(x.responseText).v||'1'}}catch(e){window.__pa_v='1'}})();
+</script>`;
+    return html.replace(/<head([^>]*)>/i, `<head$1>
+${script}`);
+  }
   /**
    * Inject CSS Before loader at start of <head>
    */