@imwz/wp-pattern-sentinel 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imwz/wp-pattern-sentinel",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Browser-based WordPress block pattern validator using Playwright",
   "type": "module",
   "engines": {

package/src/editor.js

@@ -1,7 +1,36 @@
 import { log } from './format.js';
 
+/**
+ * Replace inline PHP expressions with static equivalents so the block editor
+ * receives valid markup and the round-trip comparison stays accurate.
+ *
+ * Handles the PHP patterns that appear in Elayne theme patterns:
+ *   <?php esc_html_e( 'Text', 'elayne' ); ?>           → Text
+ *   <?php echo esc_html__( 'Text', 'elayne' ); ?>      → Text
+ *   <?php esc_attr_e( 'Alt text', 'elayne' ); ?>       → Alt text
+ *   <?php echo esc_attr__( 'Alt text', 'elayne' ); ?>  → Alt text
+ *   <?php echo esc_url( get_template_directory_uri() ); ?>  → http://example.com
+ *   All other <?php ... ?> blocks                       → removed
+ */
+function stripPhpForValidation(content) {
+  if (!content.includes('<?php')) return content;
+
+  return content
+    .replace(/<\?php\s+(?:esc_html_e|esc_html__)\s*\(\s*'([^']+)'\s*,\s*'[^']+'\s*\)\s*;?\s*\?>/g, '$1')
+    .replace(/<\?php\s+(?:esc_html_e|esc_html__)\s*\(\s*"([^"]+)"\s*,\s*"[^"]+"\s*\)\s*;?\s*\?>/g, '$1')
+    .replace(/<\?php\s+echo\s+esc_html__\s*\(\s*'([^']+)'\s*,\s*'[^']+'\s*\)\s*;?\s*\?>/g, '$1')
+    .replace(/<\?php\s+(?:esc_attr_e|esc_attr__)\s*\(\s*'([^']+)'\s*,\s*'[^']+'\s*\)\s*;?\s*\?>/g, '$1')
+    .replace(/<\?php\s+(?:esc_attr_e|esc_attr__)\s*\(\s*"([^"]+)"\s*,\s*"[^"]+"\s*\)\s*;?\s*\?>/g, '$1')
+    .replace(/<\?php\s+echo\s+esc_attr__\s*\(\s*'([^']+)'\s*,\s*'[^']+'\s*\)\s*;?\s*\?>/g, '$1')
+    .replace(/<\?php\s+echo\s+esc_url\s*\([\s\S]*?\)\s*;?\s*\?>/g, 'http://example.com')
+    .replace(/<\?php[\s\S]*?\?>/g, '')
+    .trim();
+}
+
 /**
  * Strip the PHP file header (opening tag + docblock) and return the raw block markup.
+ * Inline PHP expressions within the block markup are replaced with static values
+ * so the editor receives valid content for round-trip validation.
  * Returns null if no block comment is found.
  *
  * WordPress pattern files look like:
@@ -21,7 +50,7 @@ export function extractBlockContent(fileContent) {
     .trim();
 
   if (!stripped.startsWith('<!--')) return null;
-  return stripped;
+  return stripPhpForValidation(stripped);
 }
 
 /**

package/src/main.js

@@ -30,20 +30,27 @@ export async function main() {
     args: ['--disable-web-security'],
   });
 
-  // One authenticated context per worker — sessions are fully isolated
+  // Login once, then share the session cookies across all worker contexts.
+  // Concurrent logins to WordPress (even with valid credentials) trigger a
+  // reauth=1 redirect loop — serialising login avoids this entirely.
   let contexts;
   try {
-    contexts = await Promise.all(
-      Array.from({ length: options.concurrency }, async () => {
-        const context = await browser.newContext({ viewport: options.viewport });
-        const page    = await context.newPage();
-        page.setDefaultTimeout(60000);
-        const ok = await loginToWordPress(page, options.adminUrl, options.user, options.pass);
-        await page.close();
-        if (!ok) throw new Error('Failed to authenticate with WordPress');
-        return context;
-      })
-    );
+    log('Logging in to WordPress...', 'cyan');
+    const firstContext = await browser.newContext({ viewport: options.viewport });
+    const loginPage    = await firstContext.newPage();
+    loginPage.setDefaultTimeout(60000);
+    const ok = await loginToWordPress(loginPage, options.adminUrl, options.user, options.pass);
+    await loginPage.close();
+    if (!ok) throw new Error('Failed to authenticate with WordPress');
+    log(`Authenticated — sharing session across ${options.concurrency} worker(s)`, 'green');
+
+    const cookies = await firstContext.cookies();
+    contexts = [firstContext];
+    for (let i = 1; i < options.concurrency; i++) {
+      const ctx = await browser.newContext({ viewport: options.viewport });
+      await ctx.addCookies(cookies);
+      contexts.push(ctx);
+    }
   } catch (error) {
     log(error.message, 'red');
     await browser.close();
@@ -78,6 +85,8 @@ async function validatePatternFile(patternPath, options, context) {
   const patternName = path.basename(patternPath);
   const startTime   = Date.now();
 
+  log(`  Validating: ${patternName}`, 'cyan');
+
   let fileContent;
   try {
     fileContent = await fs.promises.readFile(patternPath, 'utf8');