@1agh/maude 0.40.0 → 0.42.0

package/apps/studio/bin/_pptx-playwright.mjs

@@ -48,10 +48,6 @@ try {
       world.style.zoom = '1';
       world.style.transform = 'none';
     }
-    for (const el of document.querySelectorAll('[data-dc-screen]')) {
-      el.style.left = '0px';
-      el.style.top = '0px';
-    }
   });
   // dom-to-pptx ships a UMD bundle; addScriptTag exposes `window.domToPptx`.
   await page.addScriptTag({ path: bundlePath });
@@ -74,6 +70,17 @@ try {
   }
   await handle.waitFor({ state: 'visible', timeout: timeoutMs });
 
+  // Pin this artboard to (0,0) for its capture, restoring afterwards so a
+  // future multi-slide implementation doesn't inherit a stacked-at-origin bug
+  // (the scatter bug fixed in the png/pdf/svg/html shims).
+  const savedPos = await handle.evaluate((el) => {
+    const ab = el.closest('[data-dc-screen]') ?? el;
+    const prev = { left: ab.style.left, top: ab.style.top };
+    ab.style.left = '0px';
+    ab.style.top = '0px';
+    return prev;
+  });
+
   // Run dom-to-pptx inside the page. It returns a Blob; we serialise to a
   // byte array for transport across the playwright boundary.
   const bytesArray = await handle.evaluate(async (el) => {
@@ -88,6 +95,12 @@ try {
     return Array.from(new Uint8Array(ab));
   });
 
+  await handle.evaluate((el, prev) => {
+    const ab = el.closest('[data-dc-screen]') ?? el;
+    ab.style.left = prev.left;
+    ab.style.top = prev.top;
+  }, savedPos);
+
   writeFileSync(out, new Uint8Array(bytesArray));
   console.log(out);
   console.error(

package/apps/studio/bin/_screenshot-playwright.mjs

@@ -5,7 +5,7 @@
 //
 // Invocation (called by screenshot.sh — not directly by users):
 //   npm exec --package=playwright -- node _screenshot-playwright.mjs \
-//     --url <url> [--selector <css>] --out <path> [--timeout 8]
+//     --url <url> [--selector <css>] --out <path> [--timeout 8] [--theme <name>]
 //
 // First invocation may install chromium (~150 MB). Subsequent runs reuse cache.
 
@@ -20,7 +20,7 @@ const args = Object.fromEntries(
   }, [])
 );
 
-const { url, selector, out, timeout = '8' } = args;
+const { url, selector, out, timeout = '8', theme } = args;
 if (!url || !out) {
   console.error(
     'usage: _screenshot-playwright.mjs --url <url> [--selector <css>] --out <path> [--timeout 8]'
@@ -37,6 +37,21 @@ try {
   const page = await ctx.newPage();
   await page.goto(url, { waitUntil: 'networkidle', timeout: timeoutMs });
 
+  if (theme) {
+    // Dual-theme reality check (/design:new step 9): force every DS artboard
+    // theme wrapper to `theme` before capture, deterministically, instead of
+    // relying on whatever the canvas is pinned to. No-op if the canvas has no
+    // `[data-theme]` elements (e.g. a single-theme DS).
+    const n = await page.evaluate((t) => {
+      const els = document.querySelectorAll('[data-theme]');
+      els.forEach((el) => {
+        el.setAttribute('data-theme', t);
+      });
+      return els.length;
+    }, theme);
+    console.error(`→ theme override: forced data-theme="${theme}" on ${n} element(s)`);
+  }
+
   if (selector) {
     const loc = page.locator(selector).first();
     await loc.waitFor({ state: 'visible', timeout: timeoutMs });

package/apps/studio/bin/_svg-playwright.mjs

@@ -70,10 +70,6 @@ try {
       world.style.zoom = '1';
       world.style.transform = 'none';
     }
-    for (const el of document.querySelectorAll('[data-dc-screen]')) {
-      el.style.left = '0px';
-      el.style.top = '0px';
-    }
   });
   // Inject dom-to-svg into the page. Bundle attaches its exports under
   // `window.domToSvg`.
@@ -81,6 +77,27 @@ try {
 
   const written = [];
 
+  // Pin one artboard to (0,0) for its capture, returning a restore function.
+  // Per-target rather than a one-shot reset of every `[data-dc-screen]` — a
+  // multi-target loop must not leave an already-captured artboard sitting at
+  // the origin, overlapping the next target's geometry (the scatter bug).
+  const pinArtboard = async (handle) => {
+    const saved = await handle.evaluate((el) => {
+      const ab = el.closest('[data-dc-screen]') ?? el;
+      const prev = { left: ab.style.left, top: ab.style.top };
+      ab.style.left = '0px';
+      ab.style.top = '0px';
+      return prev;
+    });
+    return async () => {
+      await handle.evaluate((el, prev) => {
+        const ab = el.closest('[data-dc-screen]') ?? el;
+        ab.style.left = prev.left;
+        ab.style.top = prev.top;
+      }, saved);
+    };
+  };
+
   // Single in-page serializer used by BOTH branches (single + multi) so they
   // can't drift again (the `formatXML` 500 bug came from a divergent copy).
   // Note: dom-to-svg exports only elementToSVG / inlineResources /
@@ -228,11 +245,14 @@ try {
     for (let i = 0; i < screens.length; i += 1) {
       const handle = screens[i];
       const id = (await handle.getAttribute('data-dc-screen')) ?? `artboard-${i + 1}`;
+      const restore = await pinArtboard(handle);
       // Each multi handle is already a `[data-dc-screen]` artboard — no widen.
       const svg = await serializeOne(handle, false);
+      await restore();
       const target = join(outDir, `${id}.svg`);
       writeFileSync(target, svg, 'utf8');
       written.push(target);
+      console.log(`MAUDE_PROGRESS {"current":${i + 1},"total":${screens.length}}`);
     }
   } else {
     if (!out) {
@@ -242,7 +262,9 @@ try {
     mkdirSync(dirname(out), { recursive: true });
     const handle = page.locator(selector ?? '[data-dc-screen]:first-of-type').first();
     await handle.waitFor({ state: 'visible', timeout: timeoutMs });
+    const restore = await pinArtboard(handle);
     const svg = await serializeOne(handle, widen);
+    await restore();
     writeFileSync(out, svg, 'utf8');
     written.push(out);
   }