no-mistakes(review): Fix Jinja escape filters, symlink engine, restore-test oracle

Author: dmealing

CHANGELOG.md

@@ -29,7 +29,7 @@ here.**
   reference the check cannot settle statically is `ERR_TEMPLATE_NOT_STATIC`, and a body that
   does not parse is `ERR_TEMPLATE_SYNTAX`. A generated helper over a Jinja body passes the
   engine and the payload field tree to `render`, so the check runs again at runtime. Two new
-  corpora, `fixtures/jinja-render-conformance/` (13) and `fixtures/jinja-verify-conformance/`
+  corpora, `fixtures/jinja-render-conformance/` (15) and `fixtures/jinja-verify-conformance/`
   (31), hold the two ports to identical output and findings. Java, Kotlin and C# render
   Mustache only: their providers and `verify` now refuse a Jinja-only body with
   `ERR_TEMPLATE_ENGINE_UNSUPPORTED` instead of reporting the ref as unresolved. Mustache stays

docs/CONFORMANCE.md

@@ -31,7 +31,7 @@ regenerate with `ls -d fixtures/<corpus>/*/ | wc -l` for directory-shaped corpor
 | [`fixtures/verify-conformance/`](../fixtures/verify-conformance/) | 37 | ✓ | ✓ | inherits via Java | ✓ | ✓ |
 | [`fixtures/verify-strict-conformance/`](../fixtures/verify-strict-conformance/) | 1 | ✓ | — | — | — | ✓ |
 | [`fixtures/render-conformance/`](../fixtures/render-conformance/) | 16 | ✓ | ✓ | inherits via Java | ✓ | ✓ |
-| [`fixtures/jinja-render-conformance/`](../fixtures/jinja-render-conformance/) (ADR-0061 — Jinja bodies render the same in jinja2 and nunjucks) | 13 | ✓ (nunjucks) | refuses Jinja (`ERR_TEMPLATE_ENGINE_UNSUPPORTED`) | refuses, via Java | refuses Jinja (`ERR_TEMPLATE_ENGINE_UNSUPPORTED`) | ✓ (jinja2) |
+| [`fixtures/jinja-render-conformance/`](../fixtures/jinja-render-conformance/) (ADR-0061 — Jinja bodies render the same in jinja2 and nunjucks) | 15 | ✓ (nunjucks) | refuses Jinja (`ERR_TEMPLATE_ENGINE_UNSUPPORTED`) | refuses, via Java | refuses Jinja (`ERR_TEMPLATE_ENGINE_UNSUPPORTED`) | ✓ (jinja2) |
 | [`fixtures/jinja-verify-conformance/`](../fixtures/jinja-verify-conformance/) (ADR-0061 — the payload check over a Jinja body) | 31 | ✓ | refuses Jinja | refuses, via Java | refuses Jinja | ✓ |
 | [`fixtures/extract-conformance/`](../fixtures/extract-conformance/) | 48 | ✓ | ✓ | inherits the shared JVM engine | ✓ | ✓ |
 | [`fixtures/output-prompt-conformance/`](../fixtures/output-prompt-conformance/) | 17 | ✓ | ✓ | ✓ | ✓ | ✓ |
@@ -328,12 +328,12 @@ lookup, parent-context fallthrough, falsy/empty-array section behavior, inverted
 sections, nested partials, standalone-tag whitespace stripping, raw-HTML bypass,
 trailing-newline preservation, unicode multibyte handling, and the `-last` list-separator accessor.
 
-### `fixtures/jinja-render-conformance/` (13) and `fixtures/jinja-verify-conformance/` (31)
+### `fixtures/jinja-render-conformance/` (15) and `fixtures/jinja-verify-conformance/` (31)
 
 Both → [features/templates-and-payloads.md](features/templates-and-payloads.md) (Jinja
 templates section, [ADR-0061](../spec/decisions/ADR-0061-per-port-template-engines.md)). Run by
 Python (jinja2) and TypeScript (nunjucks) only; Java, Kotlin and C# refuse a Jinja body with
-`ERR_TEMPLATE_ENGINE_UNSUPPORTED` instead. The render corpus holds 10 output cases and 2 error
+`ERR_TEMPLATE_ENGINE_UNSUPPORTED` instead. The render corpus holds 13 output cases and 2 error
 cases (an include cycle and an unresolved include), each with the same Mustache-path message.
 The verify corpus reuses `verify-conformance/`'s `payload.json` field-tree shape; an
 `ERR_TEMPLATE_SYNTAX` finding's path is the parser's own message, so runners compare it as

docs/features/templates-and-payloads.md

@@ -788,7 +788,7 @@ for the per-port pass/skip ledger.
 
 **Jinja bodies (Python and TypeScript, ADR-0061)**
 
-- [`fixtures/jinja-render-conformance/`](../../fixtures/jinja-render-conformance/) — 13 cases: variables, loops, conditionals, `set` and macros, `include` and `import`, filters, html and json escaping, whitespace control, `raw` and comments, plus an include cycle and an unresolved include. Byte-identical output from jinja2 and nunjucks.
+- [`fixtures/jinja-render-conformance/`](../../fixtures/jinja-render-conformance/) — 15 cases: variables, loops, conditionals, `set` and macros, `include` and `import`, filters, html and json escaping (with and without `| escape`), whitespace control, `raw` and comments, plus an include cycle and an unresolved include. Byte-identical output from jinja2 and nunjucks.
 - [`fixtures/jinja-verify-conformance/`](../../fixtures/jinja-verify-conformance/) — 31 cases: the payload check over the parsed template (paths, loop targets, locals, filters, includes, imports, `extends` blocks, `ERR_TEMPLATE_NOT_STATIC`, `ERR_TEMPLATE_SYNTAX`, required slots and tags).
 
 ## See also

fixtures/jinja-render-conformance/jinja-render-escape-filter-html/expected.txt

@@ -0,0 +1,4 @@
+<p>Tom &amp; &quot;Jerry&quot; &lt;it&#39;s&gt;</p>
+<p>Tom &amp; &quot;Jerry&quot; &lt;it&#39;s&gt;</p>
+<div><b>bold</b></div>
+<div>&lt;b&gt;bold&lt;/b&gt;</div>

fixtures/jinja-render-conformance/jinja-render-escape-filter-html/meta.json

@@ -0,0 +1,4 @@
+{
+  "format": "html",
+  "note": "| escape, | e and | forceescape use the format's escaper, not the engine's own HTML escaper; an escaped value is not escaped again, and | forceescape escapes a value marked | safe"
+}

fixtures/jinja-render-conformance/jinja-render-escape-filter-html/payload.json

@@ -0,0 +1,4 @@
+{
+  "title": "Tom & \"Jerry\" <it's>",
+  "markup": "<b>bold</b>"
+}

fixtures/jinja-render-conformance/jinja-render-escape-filter-html/template.jinja

@@ -0,0 +1,4 @@
+<p>{{ title | e }}</p>
+<p>{{ title | escape | e }}</p>
+<div>{{ markup | safe | e }}</div>
+<div>{{ markup | safe | forceescape }}</div>

fixtures/jinja-render-conformance/jinja-render-escape-filter-json/expected.txt

@@ -0,0 +1 @@
+{"e": "she said \"hi\"\nbye", "escape": "she said \"hi\"\nbye", "force": "she said \"hi\"\nbye"}

fixtures/jinja-render-conformance/jinja-render-escape-filter-json/meta.json

@@ -0,0 +1,4 @@
+{
+  "format": "json",
+  "note": "json format: | escape, | e and | forceescape JSON-string escape, so a template written with the Jinja escape idiom still builds a valid JSON document"
+}

fixtures/jinja-render-conformance/jinja-render-escape-filter-json/payload.json

@@ -0,0 +1,3 @@
+{
+  "quote": "she said \"hi\"\nbye"
+}