@ideasonpurpose/build-tools-wordpress 2.10.7 → 2.10.8

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.10.7
+#### Version 2.10.8
 
 [![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/actions/workflows/npm-publish.yml)

package/bin/format-wp-block-pattern.js

@@ -27,8 +27,10 @@ import prettier from "prettier";
  *   - wp:gallery
  */
 
-import { readFile, writeFile } from "fs/promises";
-import { resolve, basename } from "path";
+import { realpathSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { basename, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 
 /**
  *
@@ -146,7 +148,7 @@ export function trimInsideListElements(content) {
     .replace(/\s*<!-- wp:list /g, "<!-- wp:list ")
     .replace(/>\s*<!-- wp:list /g, ">\n\n<!-- wp:list ")
     .replace(/>\s*<!-- wp:list-item /g, ">\n\n<!-- wp:list-item ")
-    .replace(/<!-- \/wp:list-item -->\s*</g, "<!-- \/wp:list-item -->\n\n<")
+    .replace(/<!-- \/wp:list-item -->\s*</g, "<!-- /wp:list-item -->\n\n<")
     .replace(/<li>\s*/g, "<li>")
     .replace(/\s*<\/li>/g, "</li>");
 }
@@ -177,12 +179,10 @@ export function formatWithPrettier(content) {
 }
 
 /**
- * @param {String} filepath
+ * @param {string} content
+ * @returns {Promise<string>}
  */
-export async function formatWPBlockPattern(filepath) {
-  const startTime = process.hrtime.bigint();
-  const rawFile = await readFile(filepath, "utf8");
-
+export async function formatWPBlockPatternContent(content) {
   const formatters = [
     formatWithPrettier,
     normalizeCommentTagSpacing,
@@ -192,10 +192,19 @@ export async function formatWPBlockPattern(filepath) {
     normalizeNewlines,
   ];
 
-  const outputHtml = await formatters.reduce(
+  return formatters.reduce(
     async (acc, fn) => fn(await acc),
-    Promise.resolve(rawFile),
+    Promise.resolve(content),
   );
+}
+
+/**
+ * @param {string} filepath
+ */
+export async function formatWPBlockPattern(filepath) {
+  const startTime = process.hrtime.bigint();
+  const rawFile = await readFile(filepath, "utf8");
+  const outputHtml = await formatWPBlockPatternContent(rawFile);
 
   await writeFile(filepath, outputHtml, "utf8");
   const endTime = process.hrtime.bigint();
@@ -204,11 +213,49 @@ export async function formatWPBlockPattern(filepath) {
   console.log(`${basename(filepath)} ${(duration / 1e6).toFixed(2)}ms`);
 }
 
+/**
+ * @returns {Promise<string>}
+ */
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(chunk);
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
+
 export async function main(filepath = process.argv[2]) {
-  if (!filepath) {
-    console.error("Error: A filepath is required.");
-    return;
+  try {
+    if (filepath) {
+      await formatWPBlockPattern(resolve(filepath));
+      return;
+    }
+
+    if (process.stdin.isTTY) {
+      console.error(
+        "Usage: iop-format-wp-block-pattern <filepath>\n       iop-format-wp-block-pattern < input.php",
+      );
+      process.exitCode = 1;
+      return;
+    }
+
+    const formatted = await formatWPBlockPatternContent(await readStdin());
+    process.stdout.write(formatted);
+  } catch (error) {
+    console.error("Error:", error);
+    process.exitCode = 1;
   }
-  await formatWPBlockPattern(resolve(filepath));
 }
-if (process.argv[2]) main();
+
+const isMain = (() => {
+  if (process.argv[1] == null) return false;
+  try {
+    return (
+      fileURLToPath(import.meta.url) === realpathSync(resolve(process.argv[1]))
+    );
+  } catch {
+    return false;
+  }
+})();
+
+if (isMain) main();

package/bin/format-wp-php.js

@@ -0,0 +1,83 @@
+#!/usr/bin/env node
+
+//@ts-check
+
+import { execFileSync } from "node:child_process";
+import { realpathSync } from "node:fs";
+import { resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const blockPatternPath = /(?:^|\/)wp-content\/themes\/[^/]+\/patterns\/.*\.php$/;
+
+/**
+ * @param {string} filepath
+ * @returns {string}
+ */
+export function getFormatter(filepath) {
+  const normalizedPath = filepath.replaceAll("\\", "/");
+  return blockPatternPath.test(normalizedPath)
+    ? "iop-format-wp-block-pattern"
+    : "format-mixed-php-html";
+}
+
+/**
+ * @param {string[]} args
+ */
+export async function main(args = process.argv.slice(2)) {
+  const fileFlagIndex = args.indexOf("--file");
+  const filepath = args[fileFlagIndex + 1];
+
+  if (fileFlagIndex === -1 || !filepath) {
+    console.error(
+      "Usage: iop-format-wp-php --file <filepath> < input.php",
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  if (process.stdin.isTTY) {
+    console.error(
+      "Usage: iop-format-wp-php --file <filepath> < input.php",
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  const formatter = getFormatter(filepath);
+
+  try {
+    const formatted = execFileSync(formatter, [], {
+      input: await readStdin(),
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "inherit"],
+    });
+    process.stdout.write(formatted);
+  } catch (error) {
+    console.error(`Error running ${formatter}:`, error);
+    process.exitCode = 1;
+  }
+}
+
+/**
+ * @returns {Promise<string>}
+ */
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(chunk);
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
+
+const isMain = (() => {
+  if (process.argv[1] == null) return false;
+  try {
+    return (
+      fileURLToPath(import.meta.url) === realpathSync(resolve(process.argv[1]))
+    );
+  } catch {
+    return false;
+  }
+})();
+
+if (isMain) main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.10.7",
+  "version": "2.10.8",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {
@@ -23,6 +23,7 @@
     "iop-build-zip-archive": "./bin/zip.js",
     "iop-html-php-prettier": "./bin/format-php-prettier.js",
     "iop-format-wp-block-pattern": "./bin/format-wp-block-pattern.js",
+    "iop-format-wp-php": "./bin/format-wp-php.js",
     "iop-project-refresh": "./bin/refresh.js",
     "iop-vscode-svgo": "./bin/vscode-svgo.js"
   },