@ideasonpurpose/build-tools-wordpress 2.2.2 → 2.2.4

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### v2.2.3
+
+> 9 September 2025
+
+- trying explicit PHP plugin loading
+
+#### v2.2.2
+
+> 9 September 2025
+
+- tweaking deps
+
 #### v2.2.1
 
 > 9 September 2025

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.2.2
+#### Version 2.2.4
 
 [![NPM Version](https://img.shields.io/npm/v/%40ideasonpurpose%2Fbuild-tools-wordpress?logo=npm)](https://www.npmjs.com/package/@ideasonpurpose/build-tools-wordpress)
 [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/ideasonpurpose/build-tools-wordpress/npm-publish.yml?logo=github&logoColor=white)](https://github.com/ideasonpurpose/build-tools-wordpress#readme)

package/bin/format-php-prettier.js

@@ -11,6 +11,11 @@
 import prettier from "prettier";
 import prettierConfig from "@ideasonpurpose/prettier-config" with { type: "json" };
 
+const phpPlugin = await import("@prettier/plugin-php");
+
+// Explicitly reset the plugin because global installs can't resolve it
+prettierConfig.plugins = [phpPlugin];
+
 import { readFile, writeFile } from "fs/promises";
 import { resolve, basename } from "path";
 
@@ -53,7 +58,7 @@ const isInTag = (html, offset) => {
  */
 export function tokenizeHTML(htmlContent) {
   let tokenizedHTML = "";
-  const phpCodeBlocks = {};
+  const phpCodeBlocks = new Map();  // Changed to Map for better performance and type safety
   let tokenCount = 0;
 
   /**
@@ -98,7 +103,7 @@ export function tokenizeHTML(htmlContent) {
     tokenizedHTML += htmlContent.slice(lastIndex, match.index);
 
     token = tokenizeCodeBlock(match[0], tokenizedHTML);
-    phpCodeBlocks[token] = match[0];
+    phpCodeBlocks.set(token, match[0]);
     tokenizedHTML += token;
 
     lastIndex = match.index + match[0].length;
@@ -110,7 +115,7 @@ export function tokenizeHTML(htmlContent) {
 
 export function unTokenizeHTML(tokenizedHTML, phpCodeBlocks) {
   let phpContent = tokenizedHTML;
-  for (const token in phpCodeBlocks) {
+  for (const [token, phpBlock] of phpCodeBlocks) {
     /**
      * Create a pattern from token that matches whitespace breaks resulting
      * from Prettier's HTML formatting, usually on very long lines.
@@ -120,7 +125,7 @@ export function unTokenizeHTML(tokenizedHTML, phpCodeBlocks) {
     const regexToken = new RegExp(token.replace("_ />", "_\\s+\\/>"), "g");
     phpContent = phpContent.replace(
       regexToken,
-      phpCodeBlocks[token].replace(/\$/g, "$$$$"),
+      phpBlock.replace(/\$/g, "$$$$"),
     );
   }
   return phpContent;
@@ -157,6 +162,7 @@ async function formatHTMLThenPHP(filepath) {
       ...phpOptions,
       parser: "php",
       embeddedLanguageFormatting: "auto",
+      // plugins: [phpPlugin], // Explicitly pass the plugin
     });
 
     await writeFile(filepath, phpFormatted, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {

package/test/format-php-prettier.test.js

@@ -34,9 +34,9 @@ describe("HTML-PHP Prettier", () => {
       await readFile("./test/fixtures/format-php-prettier/basic-html.php")
     ).toString();
 
-    const { phpCodeBlocks: codeBlocks } = tokenizeHTML(input);
+    const { phpCodeBlocks } = tokenizeHTML(input);
 
-    const tokens = Object.keys(codeBlocks);
+    const tokens = Array.from(phpCodeBlocks.keys());
 
     expect(tokens[0]).toMatch(/^<php_\d+_* \/>$/);
     expect(tokens[1]).toMatch(/^_php_\d+_*$/);
@@ -51,9 +51,9 @@ describe("HTML-PHP Prettier", () => {
       )
     ).toString();
 
-    const { phpCodeBlocks: codeBlocks } = tokenizeHTML(input);
+    const { phpCodeBlocks } = tokenizeHTML(input);
 
-    const tokens = Object.keys(codeBlocks);
+    const tokens = Array.from(phpCodeBlocks.keys());
 
     expect(tokens).toHaveLength(1);
   });
@@ -69,7 +69,8 @@ describe("HTML-PHP Prettier", () => {
 
     // console.log({input, tokenizedHTML})
 
-    const tokens = Object.keys(phpCodeBlocks);
+    // const tokens = Object.keys(phpCodeBlocks);
+    const tokens = Array.from(phpCodeBlocks.keys());
 
     expect(tokens[0]).toMatch(/^_php_\d+_*$/);
     expect(tokens[1]).toMatch(/^_php_\d+_*$/);
@@ -141,8 +142,8 @@ describe("HTML-PHP Prettier", () => {
 
     expect(tokenizedHTML).toContain("<php_0____ />");
     expect(tokenizedHTML).toContain("<php_1____ />");
-    expect(phpCodeBlocks).toHaveProperty("<php_0____ />");
-    expect(phpCodeBlocks).toHaveProperty("<php_1____ />");
+    expect(phpCodeBlocks.has("<php_0____ />")).toBe(true);
+    expect(phpCodeBlocks.has("<php_1____ />")).toBe(true);
   });
 
   /**