@kirigami/php-prepros 3.2.0 → 3.2.2

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "@kirigami/php-prepros",
-  "version": "3.2.0",
-  "description": "PHP preprocessor for the Kirigami static site generator. Compile PHP page templates to clean, deployable HTML — with zero server dependency.",
-  "keywords": [
-    "kirigami",
-    "php",
-    "preprocessor",
-    "static-site-generator",
-    "ssg",
-    "wasm",
-    "php-wasm",
-    "markdown",
-    "yaml",
-    "github-pages",
-    "pages"
-  ],
-  "license": "GPL-3.0-or-later",
-  "author": "Maxime Larrivée-Roy",
-  "type": "module",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "files": [
-    "index.js",
-    "index.d.ts",
-    "src/",
-    "LICENSE",
-    "README.md"
-  ],
-  "engines": {
-    "node": ">=24.0.0",
-    "npm": ">=10.2.3"
-  },
-  "exports": {
-    ".": {
-      "import": "./index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "test": "node --test --test-concurrency=1 \"test/*.test.js\""
-  },
-  "dependencies": {
-    "@kirigami/php-wasm": "8.5.11-1",
-    "@kirigami/struct-walker": "1.0.6",
-    "picomatch": "^4.0.7"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/php-kirigami/kirigami.git"
-  },
-  "homepage": "https://php-kirigami.github.io",
-  "bugs": {
-    "url": "https://github.com/php-kirigami/kirigami/issues"
-  }
-}
+{
+  "name": "@kirigami/php-prepros",
+  "version": "3.2.2",
+  "description": "PHP preprocessor for the Kirigami static site generator. Compile PHP page templates to clean, deployable HTML — with zero server dependency.",
+  "keywords": [
+    "kirigami",
+    "php",
+    "preprocessor",
+    "static-site-generator",
+    "ssg",
+    "wasm",
+    "php-wasm",
+    "markdown",
+    "yaml",
+    "github-pages",
+    "pages"
+  ],
+  "license": "GPL-3.0-or-later",
+  "author": "Maxime Larrivée-Roy",
+  "type": "module",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "files": [
+    "index.js",
+    "index.d.ts",
+    "src/",
+    "LICENSE",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=24.0.0",
+    "npm": ">=10.2.3"
+  },
+  "exports": {
+    ".": {
+      "import": "./index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "test": "node --test --test-concurrency=1 \"test/*.test.js\""
+  },
+  "dependencies": {
+    "@kirigami/php-wasm": "8.5.11-1",
+    "@kirigami/struct-walker": "1.0.6",
+    "picomatch": "^4.0.7"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/php-kirigami/kirigami.git"
+  },
+  "homepage": "https://php-kirigami.github.io",
+  "bugs": {
+    "url": "https://github.com/php-kirigami/kirigami/issues"
+  }
+}

package/src/libraries/html.class.php

@@ -25,6 +25,7 @@ class HTML
         'code', 'dfn', 'em', 'i', 'img', 'input', 'kbd', 'label', 'map',
         'mark', 'object', 'output', 'q', 's', 'samp', 'select', 'small',
         'span', 'strong', 'sub', 'sup', 'textarea', 'time', 'tt', 'u', 'var',
+        'bdi', 'data', 'del', 'font', 'ins', 'rp', 'rt', 'ruby', 'strike', 'wbr',
     ];
 
     // The HTML namespace URI Lexbor assigns to plain HTML elements (foreign
@@ -188,20 +189,63 @@ class HTML
         }
 
         $inner = '';
-        foreach ($children as $child) {
-            $inner .= static::renderNode($child, $depth + 1);
+        foreach (static::groupInlineRuns($children) as $group) {
+            if (is_array($group)) {
+                // Text and inline elements that follow each other: one line, so
+                // the spaces between them survive ("<b>bold</b>, next").
+                $inner .= str_repeat(' ', ($depth + 1) * self::INDENT) . trim(static::renderInlineNodes($group)) . "\n";
+                continue;
+            }
+            $inner .= static::renderNode($group, $depth + 1);
         }
 
         return "{$pad}<{$tag}{$attrs}>\n{$inner}{$pad}</{$tag}>\n";
     }
 
+    // Splits a block's children into single nodes and runs (arrays) of
+    // consecutive text/inline nodes that contain real text. A run without text
+    // (a row of <a><img></a>, say) stays as separate nodes, one per line.
+    private static function groupInlineRuns(array $children): array
+    {
+        $groups = [];
+        $run    = [];
+        $flush  = static function () use (&$groups, &$run) {
+            $hasText = false;
+            foreach ($run as $node) {
+                if ($node->nodeType === XML_TEXT_NODE && trim($node->nodeValue) !== '') $hasText = true;
+            }
+            if ($hasText) $groups[] = $run;
+            else foreach ($run as $node) $groups[] = $node;
+            $run = [];
+        };
+        foreach ($children as $child) {
+            $isInline = $child->nodeType === XML_TEXT_NODE
+                || ($child->nodeType === XML_ELEMENT_NODE
+                    && static::isInline($child)
+                    && static::hasOnlyInlineChildren($child));
+            if ($isInline) {
+                $run[] = $child;
+            } else {
+                $flush();
+                $groups[] = $child;
+            }
+        }
+        $flush();
+        return $groups;
+    }
+
     // Serializes a node's inline content on a single line, collapsing any run
     // of spaces/tabs/newlines in the source text to a single space (equivalent
     // to HTML's whitespace-collapsing behavior).
     private static function renderInline(Dom\Node $node): string
+    {
+        return static::renderInlineNodes($node->childNodes);
+    }
+
+    private static function renderInlineNodes(iterable $nodes): string
     {
         $out = '';
-        foreach ($node->childNodes as $child) {
+        foreach ($nodes as $child) {
             if ($child->nodeType === XML_TEXT_NODE) {
                 $text = preg_replace('/\s+/', ' ', $child->nodeValue);
                 $out .= htmlspecialchars($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
@@ -244,6 +288,14 @@ class HTML
         return $elementCount <= 1;
     }
 
+    // A known inline element, or a custom element (its name always has a
+    // hyphen), which browsers lay out inline unless a stylesheet says otherwise.
+    private static function isInline(Dom\Node $node): bool
+    {
+        $name = strtolower($node->nodeName);
+        return in_array($name, self::INLINE, true) || str_contains($name, '-');
+    }
+
     // Checks that every direct descendant is inline (text, inline void, inline elements)
     // The inline elements themselves must not contain block elements
     private static function hasOnlyInlineChildren(Dom\Node $node): bool
@@ -255,7 +307,7 @@ class HTML
             if ($child->nodeType !== XML_ELEMENT_NODE) {
                 return false;
             }
-            if (!in_array(strtolower($child->nodeName), self::INLINE, true)) {
+            if (!static::isInline($child)) {
                 return false;
             }
             // Recursive: the inline element must not contain block elements

package/src/libraries/ld.class.php

@@ -746,8 +746,9 @@ final class LD
         if ($url === null || $url === '') return null;
         if (preg_match('#^(https?:)?//#', $url) || str_starts_with($url, 'data:')) return $url;
 
-        $origin = preg_replace('#^(https?://[^/]+).*#', '$1', (string) (self::data()->baseurl ?? ''));
-        return $origin . '/' . ltrim($url, '/');
+        // Against the whole baseurl, path included: a site on `user.github.io/repo` keeps `/repo`.
+        $base = rtrim((string) (self::data()->baseurl ?? ''), '/');
+        return $base . '/' . ltrim($url, '/');
     }
 
     /** @return array<int,string> */

package/src/libraries/md.class.php

@@ -1,57 +1,57 @@
-<?php
-
-/**
- * MD — Markdown renderer backed by the native `mdhtml` extension (CommonMark
- * + GFM via cmark-gfm 0.29.0.gfm.13, statically built into @kirigami/php-wasm
- * — see php-kirigami/php-mdhtml).
- *
- * Switched from the hand-written recursive-descent/regex renderer to this
- * native extension — see docs/DECISIONS.md and docs/STATUS.md in the repo
- * root for the full reasoning. Every MD::toHtml() extension (plugins, emoji,
- * GFM alerts, definition lists, heading anchors, ==highlight==/^sup^/~sub~)
- * is reimplemented in C, not just the CommonMark/GFM core — see php-mdhtml's
- * README for exactly what's covered.
- *
- * Kept the old implementation as MD_LEGACY (md-legacy.class.php) — untouched,
- * still autoloadable — as a rollback path.
- *
- * Usage:
- *   $html = MD::toHtml($markdown);
- *   MD::registerPlugin('name', function (array $args, string $body): string { ... });
- *   MD::registerEmoji('kirigami', '📐');
- */
-class MD
-{
-    public static function registerPlugin(string $name, callable $callback): void
-    {
-        \MDHtml\RegisterPlugin($name, $callback);
-    }
-
-    public static function unregisterPlugin(string $name): void
-    {
-        \MDHtml\UnregisterPlugin($name);
-    }
-
-    public static function getRegisteredPlugins(): array
-    {
-        return \MDHtml\GetRegisteredPlugins();
-    }
-
-    public static function registerEmoji(string $shortcode, string $char): void
-    {
-        \MDHtml\RegisterEmoji($shortcode, $char);
-    }
-
-    public static function toHtml(string $markdown): string
-    {
-        return \MDHtml\Render($markdown);
-    }
-}
-
-
-// Default Markdown plugins ({% codepen %}, {% checklist %}, {% callout %},
-// {% img-asset %}) — "registered out of the box" per the README. Loaded here
-// so every entrypoint (prepros.php, runenv.php, imagebatch.php) gets them
-// without an explicit include. A project can still MD::unregisterPlugin() any
-// of them, or MD::registerPlugin() its own with the same name to override.
-include_once(__DIR__ . '/md.plugins.php');
+<?php
+
+/**
+ * MD — Markdown renderer backed by the native `mdhtml` extension (CommonMark
+ * + GFM via cmark-gfm 0.29.0.gfm.13, statically built into @kirigami/php-wasm
+ * — see php-kirigami/php-mdhtml).
+ *
+ * Switched from the hand-written recursive-descent/regex renderer to this
+ * native extension — see docs/DECISIONS.md and docs/STATUS.md in the repo
+ * root for the full reasoning. Every MD::toHtml() extension (plugins, emoji,
+ * GFM alerts, definition lists, heading anchors, ==highlight==/^sup^/~sub~)
+ * is reimplemented in C, not just the CommonMark/GFM core — see php-mdhtml's
+ * README for exactly what's covered.
+ *
+ * Kept the old implementation as MD_LEGACY (md-legacy.class.php) — untouched,
+ * still autoloadable — as a rollback path.
+ *
+ * Usage:
+ *   $html = MD::toHtml($markdown);
+ *   MD::registerPlugin('name', function (array $args, string $body): string { ... });
+ *   MD::registerEmoji('kirigami', '📐');
+ */
+class MD
+{
+    public static function registerPlugin(string $name, callable $callback): void
+    {
+        \MDHtml\RegisterPlugin($name, $callback);
+    }
+
+    public static function unregisterPlugin(string $name): void
+    {
+        \MDHtml\UnregisterPlugin($name);
+    }
+
+    public static function getRegisteredPlugins(): array
+    {
+        return \MDHtml\GetRegisteredPlugins();
+    }
+
+    public static function registerEmoji(string $shortcode, string $char): void
+    {
+        \MDHtml\RegisterEmoji($shortcode, $char);
+    }
+
+    public static function toHtml(string $markdown): string
+    {
+        return \MDHtml\Render($markdown);
+    }
+}
+
+
+// Default Markdown plugins ({% codepen %}, {% callout %},
+// {% img-asset %}) — "registered out of the box" per the README. Loaded here
+// so every entrypoint (prepros.php, runenv.php, imagebatch.php) gets them
+// without an explicit include. A project can still MD::unregisterPlugin() any
+// of them, or MD::registerPlugin() its own with the same name to override.
+include_once(__DIR__ . '/md.plugins.php');

package/src/libraries/md.plugins.php

@@ -1,103 +1,80 @@
-<?php
-
-
-
-// =============================================================================
-// DEFAULT MARKDOWN PLUGINS
-//
-// Auto-loaded from md.class.php, so these are available in every render without
-// any setup ("registered out of the box"). To drop one, call
-// MD::unregisterPlugin('name') (or md_unregister_plugin('name')) from an
-// `includes` file; to change one, MD::registerPlugin() your own under the same
-// name.
-// =============================================================================
-
-// --- CodePen (inline) ---
-// {% codepen PENid %}
-// {% codepen PENid user height %}
-MD::registerPlugin('codepen', function (array $args, string $body): string {
-    $id     = htmlspecialchars($args[0] ?? '', ENT_QUOTES, 'UTF-8');
-    $user   = htmlspecialchars($args[1] ?? 'anonymous', ENT_QUOTES, 'UTF-8');
-    $height = intval($args[2] ?? 400);
-    if ($id === '') return '<!-- codepen: missing id -->';
-    return "<iframe height=\"{$height}\" style=\"width:100%\" "
-         . "scrolling=\"no\" "
-         . "src=\"https://codepen.io/{$user}/embed/{$id}?default-tab=result\" "
-         . "frameborder=\"no\" loading=\"lazy\" allowfullscreen>"
-         . "</iframe>";
-});
-
-// --- Checklist (multi-line block) ---
-// {% checklist
-// Do the dishes
-// Walk the dog
-// Read a book
-// %}
-//
-// Optionally with a title:
-// {% checklist "My tasks for today"
-// Task 1
-// Task 2
-// %}
-MD::registerPlugin('checklist', function (array $args, string $body): string {
-    $title = !empty($args[0]) ? '<p class="checklist-title"><strong>' . htmlspecialchars($args[0], ENT_QUOTES, 'UTF-8') . '</strong></p>' : '';
-    $items = array_filter(array_map('trim', explode("\n", $body)));
-    if (empty($items)) return '<!-- checklist: no items -->';
-    $html = "<div class=\"checklist\">{$title}<ul>\n";
-    foreach ($items as $item) {
-        $html .= '  <li><label><input type="checkbox" /> ' . htmlspecialchars($item, ENT_QUOTES, 'UTF-8') . '</label></li>' . "\n";
-    }
-    return $html . "</ul></div>";
-});
-
-// --- Custom callout (inline or block) ---
-// Inline:  {% callout warning "Warning!" Content on one line %}
-// Block :  {% callout danger "Title"
-//            Paragraph 1
-//
-//            Paragraph 2
-//            %}
-MD::registerPlugin('callout', function (array $args, string $body): string {
-    $validTypes = ['info', 'success', 'warning', 'danger'];
-    $type  = in_array($args[0] ?? '', $validTypes, true) ? $args[0] : 'info';
-    $title = !empty($args[1]) ? htmlspecialchars($args[1], ENT_QUOTES, 'UTF-8') : '';
-
-    // Content: $body for a block tag, otherwise the remaining args on the opening line
-    if ($body !== '') {
-        $content = htmlspecialchars($body, ENT_QUOTES, 'UTF-8');
-        // Replace double line breaks with <br><br> to preserve paragraphs
-        $content = str_replace("\n\n", '<br><br>', $content);
-        $content = str_replace("\n", '<br>', $content);
-    } else {
-        $content = htmlspecialchars(implode(' ', array_slice($args, $title ? 2 : 1)), ENT_QUOTES, 'UTF-8');
-    }
-
-    $titleHtml = $title ? "<strong>{$title}</strong><br>" : '';
-    return "<div class=\"callout callout-{$type}\">{$titleHtml}{$content}</div>";
-});
-
-// --- Image asset (inline) — same pipeline as <img asset>, via IMG::asset() ---
-// {% img-asset photo.jpg %}
-// {% img-asset photo.jpg 800 %}
-// {% img-asset photo.jpg 800 600 %}
-// {% img-asset photo.jpg 800 600 cover %}
-MD::registerPlugin('img-asset', function (array $args, string $body): string {
-    $path = trim($args[0] ?? '');
-    if ($path === '') return '<!-- img-asset: missing path -->';
-
-    $width  = isset($args[1]) ? (int) $args[1] : 0;
-    $height = isset($args[2]) ? (int) $args[2] : 0;
-    $cover  = isset($args[3]) && strtolower($args[3]) === 'cover';
-
-    // A resolvable path is required to actually call IMG::asset() — this
-    // also protects a literal `{% img-asset path … %}` written as Markdown
-    // *documentation* (inside a code span): the plugin still runs even when
-    // its output ends up discarded for the literal text, so a placeholder
-    // path must not throw.
-    try {
-        $src = IMG::asset($path, $width, $height, $cover, PREPROS::$file);
-    } catch (Throwable $e) {
-        return '<!-- img-asset: ' . htmlspecialchars($e->getMessage(), ENT_QUOTES, 'UTF-8') . ' -->';
-    }
-    return '<img src="' . htmlspecialchars($src, ENT_QUOTES, 'UTF-8') . '" alt="">';
+<?php
+
+
+
+// =============================================================================
+// DEFAULT MARKDOWN PLUGINS
+//
+// Auto-loaded from md.class.php, so these are available in every render without
+// any setup ("registered out of the box"). To drop one, call
+// MD::unregisterPlugin('name') (or md_unregister_plugin('name')) from an
+// `includes` file; to change one, MD::registerPlugin() your own under the same
+// name.
+// =============================================================================
+
+// --- CodePen (inline) ---
+// {% codepen PENid %}
+// {% codepen PENid user height %}
+MD::registerPlugin('codepen', function (array $args, string $body): string {
+    $id     = htmlspecialchars($args[0] ?? '', ENT_QUOTES, 'UTF-8');
+    $user   = htmlspecialchars($args[1] ?? 'anonymous', ENT_QUOTES, 'UTF-8');
+    $height = intval($args[2] ?? 400);
+    if ($id === '') return '<!-- codepen: missing id -->';
+    return "<iframe height=\"{$height}\" style=\"width:100%\" "
+         . "scrolling=\"no\" "
+         . "src=\"https://codepen.io/{$user}/embed/{$id}?default-tab=result\" "
+         . "frameborder=\"no\" loading=\"lazy\" allowfullscreen>"
+         . "</iframe>";
+});
+
+// --- Custom callout (inline or block) ---
+// Inline:  {% callout warning "Warning!" Content on one line %}
+// Block :  {% callout danger "Title"
+//            Paragraph 1
+//
+//            Paragraph 2
+//            %}
+MD::registerPlugin('callout', function (array $args, string $body): string {
+    $validTypes = ['info', 'success', 'warning', 'danger'];
+    $type  = in_array($args[0] ?? '', $validTypes, true) ? $args[0] : 'info';
+    $title = !empty($args[1]) ? htmlspecialchars($args[1], ENT_QUOTES, 'UTF-8') : '';
+
+    // Content: $body for a block tag, otherwise the remaining args on the opening line
+    if ($body !== '') {
+        $content = htmlspecialchars($body, ENT_QUOTES, 'UTF-8');
+        // Replace double line breaks with <br><br> to preserve paragraphs
+        $content = str_replace("\n\n", '<br><br>', $content);
+        $content = str_replace("\n", '<br>', $content);
+    } else {
+        $content = htmlspecialchars(implode(' ', array_slice($args, $title ? 2 : 1)), ENT_QUOTES, 'UTF-8');
+    }
+
+    $titleHtml = $title ? "<strong>{$title}</strong><br>" : '';
+    return "<div class=\"callout callout-{$type}\">{$titleHtml}{$content}</div>";
+});
+
+// --- Image asset (inline) — same pipeline as <img asset>, via IMG::asset() ---
+// {% img-asset photo.jpg %}
+// {% img-asset photo.jpg 800 %}
+// {% img-asset photo.jpg 800 600 %}
+// {% img-asset photo.jpg 800 600 cover %}
+MD::registerPlugin('img-asset', function (array $args, string $body): string {
+    $path = trim($args[0] ?? '');
+    if ($path === '') return '<!-- img-asset: missing path -->';
+
+    $width  = isset($args[1]) ? (int) $args[1] : 0;
+    $height = isset($args[2]) ? (int) $args[2] : 0;
+    $cover  = isset($args[3]) && strtolower($args[3]) === 'cover';
+
+    // A resolvable path is required to actually call IMG::asset() — this
+    // also protects a literal `{% img-asset path … %}` written as Markdown
+    // *documentation* (inside a code span): the plugin still runs even when
+    // its output ends up discarded for the literal text, so a placeholder
+    // path must not throw.
+    try {
+        $src = IMG::asset($path, $width, $height, $cover, PREPROS::$file);
+    } catch (Throwable $e) {
+        return '<!-- img-asset: ' . htmlspecialchars($e->getMessage(), ENT_QUOTES, 'UTF-8') . ' -->';
+    }
+    return '<img src="' . htmlspecialchars($src, ENT_QUOTES, 'UTF-8') . '" alt="">';
 });

package/src/libraries/meta.class.php

@@ -458,8 +458,9 @@ final class META
         $url = trim($url);
         if (preg_match('#^(https?:)?//#', $url) || str_starts_with($url, 'data:')) return $url;
 
-        $origin = preg_replace('#^(https?://[^/]+).*#', '$1', (string) (self::data()->baseurl ?? ''));
-        return $origin === '' ? $url : $origin . '/' . ltrim($url, '/');
+        // Against the whole baseurl, path included: a site on `user.github.io/repo` keeps `/repo`.
+        $base = rtrim((string) (self::data()->baseurl ?? ''), '/');
+        return $base === '' ? $url : $base . '/' . ltrim($url, '/');
     }
 
     /** `@user` / `user` / `https://twitter.com/user` → `@user`. */