ASF-injectie 3/5: CmsPageHtml (neutrale lijst + banner-HTML, prijsregels) en OfferingsHtmlTransform; golden files van ASF (16027f5) slagen
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,7 @@
|
|||||||
|
# Golden files of the website build (ASF)
|
||||||
|
|
||||||
|
`host-injection/` is a copy of `web/contract/host-injection` of the Andrea Slop Fotografie website repository,
|
||||||
|
ASF commit `16027f5` (branch `feature/asf-packages-cms`). It is the contract for the plain HTML the CMS host writes
|
||||||
|
between the CMS markers (see `host-injection/README.md` for the rules). `GoldenHtmlTests` runs `CmsPageHtml` against
|
||||||
|
every input/expected pair. When the website changes the contract it sends new files and the commit; replace the
|
||||||
|
folder and note the new commit here.
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# Host injection contract (ASF site and CMS host)
|
||||||
|
|
||||||
|
The ASF build leaves markers in the prerendered pages; the CMS host fills them from live data. This folder holds the golden files for the two list regions. For every `NAME.input.json` there is a `NAME.expected.html`: the host's template must give exactly that text (the file ends with one newline that is not part of the HTML) for that input. The ASF repo tests its own implementation (`src/lib/cmsHtml.ts`) against the same files; to change the contract, change the code and run `UPDATE_GOLDEN=1 pnpm test src/lib/cmsHtml.test.ts`, then send the new files to the CMS session. The files come from ASF commit: see `git log -1 -- web/contract/host-injection` in the ASF repo.
|
||||||
|
|
||||||
|
## Inputs
|
||||||
|
|
||||||
|
- `offerings-*.input.json`: the answer of `GET /api/v1/offerings` (an array).
|
||||||
|
- `banner-*.input.json`: `{ "position": "top" | "bottom", "answer": <answer of GET /api/v1/offerings/banner?position=...> | null }`; `null` is a 204.
|
||||||
|
|
||||||
|
## Rules for the packages region (`<!--CMS:OFFERINGS-HTML-->`)
|
||||||
|
|
||||||
|
1. Keep a package only when all hold: `slug` is a string matching `^[a-z0-9-]+$`; `title` is a non-empty string after trimming; `features` is a non-empty array of non-empty strings (each trimmed); `price` is readable as whole euros above zero (below); the slug was not used by an earlier kept package (the first one wins). Trim all texts. Any other package is skipped.
|
||||||
|
2. Order by `displayOrder` (a number; missing counts as 0), ties keep the given order.
|
||||||
|
3. Price text to whole euros: trim, then the regex `^\D*?(\d{1,3}(?:\.\d{3})+|\d+)(?:,(?:-|0{1,2}))?\D*$`; group 1 without dots is the amount; it must be a whole number above zero. So "€ 175", "€ 1.250", "175,-", "€ 175,00" are readable; "op aanvraag", "€ 12,50", "€ 0", "175 of 185" are not.
|
||||||
|
4. Output: `<ul class="cms-offerings">` + one `<li>` per package + `</ul>`; nothing at all (empty string) when no package is kept.
|
||||||
|
5. Per package: `<li class="cms-offering" data-slug="SLUG"[ data-featured="true"]>` + `<h3>NAME</h3>` + `<p class="cms-price">€ AMOUNT</p>` + `<ul class="cms-features">` + `<li>FEATURE</li>`... + `</ul>` + `<a href="/?pakket=SLUG#contact">Boek NAME</a>` + `</li>`. `data-featured="true"` only when `featured` is the boolean `true`. AMOUNT uses a dot as thousands separator (1.250). The literal text ` ` is written, not a character. `description`, `priceNote` and `ctaLabel` are not used.
|
||||||
|
6. Escape every text (name, features, slug, amount) as: `&` `&`, `<` `<`, `>` `>`, `"` `"`, `'` `'`.
|
||||||
|
|
||||||
|
## Rules for the banner regions (`<!--CMS:BANNER-TOP-HTML-->`, `<!--CMS:BANNER-BOTTOM-HTML-->`)
|
||||||
|
|
||||||
|
1. `null` answer: empty string. Bottom: the title is required, otherwise empty string. Top: title or text is required, otherwise empty string.
|
||||||
|
2. Output `<aside class="cms-banner">` + the parts that are present, joined by one space, + `</aside>`. Parts: `<strong>TITLE</strong>`, `<span>TEXT</span>`, `<a href="URL">LABEL</a>` (trim all texts; empty means absent).
|
||||||
|
3. The link is written only when label and URL are both present and the URL is safe: it starts with `https://` and parses as a URL, or it starts with one `/` (not `//`, no backslash). Otherwise the link part is left out.
|
||||||
|
4. Escape as above (also in the `href`).
|
||||||
|
|
||||||
|
## Where the region sits
|
||||||
|
|
||||||
|
`<!--CMS:OFFERINGS-HTML-->…<!--/CMS:OFFERINGS-HTML-->` (and the two banner pairs) are written by the build; the host replaces what is between the markers and leaves the markers. See `aidlc-docs/features/asf-cms-host-injection/plan.md` for the other markers (data block, JSON-LD price, inline price).
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<aside class="cms-banner"><strong>Kerstactie</strong> <span>Alleen in december</span> <a href="/contact">Boek de actie</a></aside>
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"position": "bottom",
|
||||||
|
"answer": {
|
||||||
|
"title": "Kerstactie",
|
||||||
|
"text": "Alleen in december",
|
||||||
|
"linkLabel": "Boek de actie",
|
||||||
|
"linkUrl": "/contact",
|
||||||
|
"position": "bottom"
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<aside class="cms-banner"><strong>Past er niets bij?</strong></aside>
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"position": "bottom",
|
||||||
|
"answer": {
|
||||||
|
"title": "Past er niets bij?",
|
||||||
|
"text": null,
|
||||||
|
"linkLabel": null,
|
||||||
|
"linkUrl": null,
|
||||||
|
"position": "bottom"
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<aside class="cms-banner"><strong><img src=x onerror=alert(1)></strong> <span>"quote" & 'single'</span> <a href="https://voorbeeld.nl/?a=1&b=2">Meer</a></aside>
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"position": "bottom",
|
||||||
|
"answer": {
|
||||||
|
"title": "<img src=x onerror=alert(1)>",
|
||||||
|
"text": "\"quote\" & 'single'",
|
||||||
|
"linkLabel": "Meer",
|
||||||
|
"linkUrl": "https://voorbeeld.nl/?a=1&b=2",
|
||||||
|
"position": "bottom"
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"position": "bottom",
|
||||||
|
"answer": null
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<aside class="cms-banner"><span>Nog twee plekken in december</span></aside>
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"position": "top",
|
||||||
|
"answer": {
|
||||||
|
"title": "",
|
||||||
|
"text": "Nog twee plekken in december",
|
||||||
|
"linkLabel": null,
|
||||||
|
"linkUrl": null,
|
||||||
|
"position": "top"
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<aside class="cms-banner"><strong>Nieuw</strong> <span>x</span></aside>
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"position": "top",
|
||||||
|
"answer": {
|
||||||
|
"title": "Nieuw",
|
||||||
|
"text": "x",
|
||||||
|
"linkLabel": "Hier",
|
||||||
|
"linkUrl": "http://voorbeeld.nl",
|
||||||
|
"position": "top"
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<ul class="cms-offerings"><li class="cms-offering" data-slug="newborn" data-featured="true"><h3>Newborn</h3><p class="cms-price">€ 185</p><ul class="cms-features"><li>1-2 uur fotografie</li></ul><a href="/?pakket=newborn#contact">Boek Newborn</a></li><li class="cms-offering" data-slug="gezin"><h3>Gezin</h3><p class="cms-price">€ 1.250</p><ul class="cms-features"><li>Hele dag</li></ul><a href="/?pakket=gezin#contact">Boek Gezin</a></li></ul>
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"slug": "newborn",
|
||||||
|
"title": "Newborn",
|
||||||
|
"price": "€ 185",
|
||||||
|
"features": ["1-2 uur fotografie"],
|
||||||
|
"displayOrder": 0,
|
||||||
|
"featured": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "gezin",
|
||||||
|
"title": "Gezin",
|
||||||
|
"price": "€ 1.250,-",
|
||||||
|
"features": ["Hele dag"],
|
||||||
|
"displayOrder": 1,
|
||||||
|
"featured": false
|
||||||
|
}
|
||||||
|
]
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<ul class="cms-offerings"><li class="cms-offering" data-slug="xss"><h3><script>alert("x")</script> & "co"</h3><p class="cms-price">€ 100</p><ul class="cms-features"><li><b>vet</b></li><li>o'brien & zoon</li></ul><a href="/?pakket=xss#contact">Boek <script>alert("x")</script> & "co"</a></li></ul>
|
||||||
+9
@@ -0,0 +1,9 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"slug": "xss",
|
||||||
|
"title": "<script>alert(\"x\")</script> & \"co\"",
|
||||||
|
"price": "€ 100",
|
||||||
|
"features": ["<b>vet</b>", "o'brien & zoon"],
|
||||||
|
"displayOrder": 0
|
||||||
|
}
|
||||||
|
]
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<ul class="cms-offerings"><li class="cms-offering" data-slug="goed"><h3>Goed</h3><p class="cms-price">€ 100</p><ul class="cms-features"><li>a</li></ul><a href="/?pakket=goed#contact">Boek Goed</a></li></ul>
|
||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"slug": "goed",
|
||||||
|
"title": "Goed",
|
||||||
|
"price": "€ 100",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "Slecht Slug",
|
||||||
|
"title": "Fout",
|
||||||
|
"price": "€ 100",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "goed",
|
||||||
|
"title": "Dubbel",
|
||||||
|
"price": "€ 100",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 2
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "aanvraag",
|
||||||
|
"title": "Op aanvraag",
|
||||||
|
"price": "op aanvraag",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 3
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "leeg",
|
||||||
|
"title": "Zonder kenmerken",
|
||||||
|
"price": "€ 100",
|
||||||
|
"features": [],
|
||||||
|
"displayOrder": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "zonder-titel",
|
||||||
|
"title": "",
|
||||||
|
"price": "€ 100",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 5
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "nul",
|
||||||
|
"title": "Nul",
|
||||||
|
"price": "€ 0",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 6
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "komma",
|
||||||
|
"title": "Komma",
|
||||||
|
"price": "€ 12,50",
|
||||||
|
"features": ["a"],
|
||||||
|
"displayOrder": 7
|
||||||
|
}
|
||||||
|
]
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
<ul class="cms-offerings"><li class="cms-offering" data-slug="zwangerschap"><h3>Zwangerschap</h3><p class="cms-price">€ 175</p><ul class="cms-features"><li>1 uur fotografie</li><li>Persoonlijke online fotogalerij</li></ul><a href="/?pakket=zwangerschap#contact">Boek Zwangerschap</a></li><li class="cms-offering" data-slug="newborn"><h3>Newborn</h3><p class="cms-price">€ 185</p><ul class="cms-features"><li>1-2 uur fotografie</li></ul><a href="/?pakket=newborn#contact">Boek Newborn</a></li><li class="cms-offering" data-slug="gezin"><h3>Gezin</h3><p class="cms-price">€ 175</p><ul class="cms-features"><li>1 uur fotografie</li><li>Minstens 30 zorgvuldig nabewerkte foto's</li></ul><a href="/?pakket=gezin#contact">Boek Gezin</a></li></ul>
|
||||||
+29
@@ -0,0 +1,29 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"slug": "gezin",
|
||||||
|
"title": "Gezin",
|
||||||
|
"price": "€ 175",
|
||||||
|
"features": [
|
||||||
|
"1 uur fotografie",
|
||||||
|
"Minstens 30 zorgvuldig nabewerkte foto's"
|
||||||
|
],
|
||||||
|
"displayOrder": 2,
|
||||||
|
"description": "Een shoot met het hele gezin!",
|
||||||
|
"priceNote": "eenmalig, incl. btw"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "zwangerschap",
|
||||||
|
"title": "Zwangerschap",
|
||||||
|
"price": "€ 175",
|
||||||
|
"features": ["1 uur fotografie", "Persoonlijke online fotogalerij"],
|
||||||
|
"displayOrder": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"slug": "newborn",
|
||||||
|
"title": "Newborn",
|
||||||
|
"price": "€ 185",
|
||||||
|
"features": ["1-2 uur fotografie"],
|
||||||
|
"displayOrder": 1,
|
||||||
|
"ctaLabel": "Boek nu"
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using FluentAssertions;
|
||||||
|
using SlpModularCms.Modules.Offerings.Models;
|
||||||
|
using SlpModularCms.Modules.Offerings.Services;
|
||||||
|
|
||||||
|
namespace SlpModularCms.Modules.Offerings.Tests.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The plain HTML written between the CMS markers must be exactly what the website build expects: the golden files of
|
||||||
|
/// the website repository (Golden/SOURCE.md names the commit) are run through <see cref="CmsPageHtml"/>.
|
||||||
|
/// </summary>
|
||||||
|
public class GoldenHtmlTests
|
||||||
|
{
|
||||||
|
private static string Dir => Path.Combine(AppContext.BaseDirectory, "Golden", "host-injection");
|
||||||
|
|
||||||
|
public static IEnumerable<object[]> Offerings() => Names("offerings-");
|
||||||
|
public static IEnumerable<object[]> Banners() => Names("banner-");
|
||||||
|
|
||||||
|
private static IEnumerable<object[]> Names(string prefix) =>
|
||||||
|
Directory.GetFiles(Dir, prefix + "*.input.json").Select(f => new object[] { Path.GetFileName(f)[..^".input.json".Length] }).OrderBy(o => (string)o[0]);
|
||||||
|
|
||||||
|
// The expected files end with one newline that is not part of the HTML.
|
||||||
|
private static string Expected(string name)
|
||||||
|
{
|
||||||
|
var text = File.ReadAllText(Path.Combine(Dir, name + ".expected.html"));
|
||||||
|
return text.EndsWith('\n') ? text[..^1] : text;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static JsonElement Input(string name) => JsonDocument.Parse(File.ReadAllText(Path.Combine(Dir, name + ".input.json"))).RootElement;
|
||||||
|
|
||||||
|
private static string? Text(JsonElement e, string property) =>
|
||||||
|
e.TryGetProperty(property, out var v) && v.ValueKind == JsonValueKind.String ? v.GetString() : null;
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void TheGoldenFiles_AreThere()
|
||||||
|
{
|
||||||
|
Offerings().Count().Should().BeGreaterThanOrEqualTo(5);
|
||||||
|
Banners().Count().Should().BeGreaterThanOrEqualTo(6);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[MemberData(nameof(Offerings))]
|
||||||
|
public void OfferingsList_MatchesTheGoldenFile(string name)
|
||||||
|
{
|
||||||
|
var offerings = Input(name).EnumerateArray().Select((o, i) => new OfferingDto(
|
||||||
|
Id: i.ToString(),
|
||||||
|
Slug: Text(o, "slug")!,
|
||||||
|
Title: Text(o, "title")!,
|
||||||
|
Description: Text(o, "description") ?? string.Empty,
|
||||||
|
Price: Text(o, "price")!,
|
||||||
|
PriceNote: Text(o, "priceNote") ?? string.Empty,
|
||||||
|
Features: o.GetProperty("features").EnumerateArray().Select(f => f.GetString()!).ToList(),
|
||||||
|
CtaLabel: Text(o, "ctaLabel") ?? string.Empty,
|
||||||
|
Featured: o.TryGetProperty("featured", out var f) && f.ValueKind == JsonValueKind.True,
|
||||||
|
DisplayOrder: o.TryGetProperty("displayOrder", out var d) ? d.GetInt32() : 0)).ToList();
|
||||||
|
|
||||||
|
CmsPageHtml.OfferingsList(offerings).Should().Be(Expected(name));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[MemberData(nameof(Banners))]
|
||||||
|
public void Banner_MatchesTheGoldenFile(string name)
|
||||||
|
{
|
||||||
|
var input = Input(name);
|
||||||
|
var position = input.GetProperty("position").GetString()!;
|
||||||
|
var answer = input.GetProperty("answer");
|
||||||
|
PublicOfferingBannerDto? banner = answer.ValueKind == JsonValueKind.Null
|
||||||
|
? null
|
||||||
|
: new PublicOfferingBannerDto(Text(answer, "title")!, Text(answer, "text")!, Text(answer, "linkLabel"), Text(answer, "linkUrl"), position);
|
||||||
|
|
||||||
|
CmsPageHtml.Banner(banner, position).Should().Be(Expected(name));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("€ 175", 175)]
|
||||||
|
[InlineData("€ 1.250", 1250)]
|
||||||
|
[InlineData("175,-", 175)]
|
||||||
|
[InlineData("€ 175,00", 175)]
|
||||||
|
[InlineData("€ 1.250,-", 1250)]
|
||||||
|
[InlineData("op aanvraag", null)]
|
||||||
|
[InlineData("€ 12,50", null)]
|
||||||
|
[InlineData("€ 0", null)]
|
||||||
|
[InlineData("175 of 185", null)]
|
||||||
|
[InlineData("", null)]
|
||||||
|
[InlineData(null, null)]
|
||||||
|
public void WholeEuros_ReadsOnlyWholeEuroPrices(string? text, int? expected) =>
|
||||||
|
CmsPageHtml.WholeEuros(text).Should().Be(expected);
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData(185, "185")]
|
||||||
|
[InlineData(1250, "1.250")]
|
||||||
|
[InlineData(1000000, "1.000.000")]
|
||||||
|
public void FormatAmount_UsesADotAsThousandsSeparator(int euros, string expected) =>
|
||||||
|
CmsPageHtml.FormatAmount(euros).Should().Be(expected);
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Encode_EscapesTheFiveCharacters_AndLeavesAccentsAlone()
|
||||||
|
=> CmsPageHtml.Encode("é & < > \" '").Should().Be("é & < > " '");
|
||||||
|
}
|
||||||
@@ -26,6 +26,10 @@
|
|||||||
<Using Include="Xunit" />
|
<Using Include="Xunit" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Golden\**" CopyToOutputDirectory="PreserveNewest" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\SlpModularCms.Modules.Offerings\SlpModularCms.Modules.Offerings.csproj" />
|
<ProjectReference Include="..\SlpModularCms.Modules.Offerings\SlpModularCms.Modules.Offerings.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ public class OfferingsModule : IModule
|
|||||||
services.AddScoped<IOfferingRepository, OfferingRepository>();
|
services.AddScoped<IOfferingRepository, OfferingRepository>();
|
||||||
services.AddScoped<IOfferingsService, OfferingsService>();
|
services.AddScoped<IOfferingsService, OfferingsService>();
|
||||||
services.AddScoped<IIndexHtmlMarkerProvider, OfferingsIndexMarkers>();
|
services.AddScoped<IIndexHtmlMarkerProvider, OfferingsIndexMarkers>();
|
||||||
|
services.AddScoped<IHtmlPageTransform, OfferingsHtmlTransform>();
|
||||||
services.AddScoped<IOfferingBannerRepository, OfferingBannerRepository>();
|
services.AddScoped<IOfferingBannerRepository, OfferingBannerRepository>();
|
||||||
services.AddScoped<IOfferingBannersService, OfferingBannersService>();
|
services.AddScoped<IOfferingBannersService, OfferingBannersService>();
|
||||||
services.AddScoped<IOfferingCategoryRepository, OfferingCategoryRepository>();
|
services.AddScoped<IOfferingCategoryRepository, OfferingCategoryRepository>();
|
||||||
|
|||||||
@@ -0,0 +1,161 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using SlpModularCms.Modules.Offerings.Data.Entities;
|
||||||
|
using SlpModularCms.Modules.Offerings.Models;
|
||||||
|
|
||||||
|
namespace SlpModularCms.Modules.Offerings.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The plain, crawlable HTML the CMS host writes between the CMS markers of a prerendered page, from live data
|
||||||
|
/// (pure functions). The rules are a contract with the website build; its golden files (input JSON and expected
|
||||||
|
/// HTML) are in <c>SlpModularCms.Modules.Offerings.Tests/Golden/host-injection</c> and are tested against this class.
|
||||||
|
/// </summary>
|
||||||
|
public static partial class CmsPageHtml
|
||||||
|
{
|
||||||
|
[GeneratedRegex(@"^\D*?(\d{1,3}(?:\.\d{3})+|\d+)(?:,(?:-|0{1,2}))?\D*$", RegexOptions.CultureInvariant)]
|
||||||
|
private static partial Regex WholeEuroPrice();
|
||||||
|
|
||||||
|
[GeneratedRegex("^[a-z0-9-]+$", RegexOptions.CultureInvariant)]
|
||||||
|
private static partial Regex SlugPattern();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A price text read as whole euros above zero: "€ 175", "€ 1.250", "175,-" and "€ 175,00" are 175, 1250, 175, 175;
|
||||||
|
/// "op aanvraag", "€ 12,50", "€ 0" and "175 of 185" are not a price (null). Never guessed.
|
||||||
|
/// </summary>
|
||||||
|
public static int? WholeEuros(string? price)
|
||||||
|
{
|
||||||
|
var match = WholeEuroPrice().Match((price ?? string.Empty).Trim());
|
||||||
|
if (!match.Success)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return int.TryParse(match.Groups[1].Value.Replace(".", string.Empty), NumberStyles.None, CultureInfo.InvariantCulture, out var euros)
|
||||||
|
&& euros > 0
|
||||||
|
? euros
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The amount with a dot as thousands separator (1250 is "1.250").</summary>
|
||||||
|
public static string FormatAmount(int euros) => euros.ToString("#,##0", CultureInfo.InvariantCulture).Replace(',', '.');
|
||||||
|
|
||||||
|
/// <summary>"€&nbsp;185": the euro sign, the entity for a non-breaking space (written as text) and the amount.</summary>
|
||||||
|
public static string PriceHtml(int euros) => "€ " + FormatAmount(euros);
|
||||||
|
|
||||||
|
/// <summary>The offerings that have a place in the list: see <see cref="OfferingsList"/>.</summary>
|
||||||
|
internal static IReadOnlyList<(OfferingDto Offering, string Slug, string Title, int Euros, IReadOnlyList<string> Features)> Keep(
|
||||||
|
IReadOnlyList<OfferingDto> offerings)
|
||||||
|
{
|
||||||
|
var kept = new List<(OfferingDto, string, string, int, IReadOnlyList<string>)>();
|
||||||
|
var seen = new HashSet<string>(StringComparer.Ordinal);
|
||||||
|
|
||||||
|
foreach (var offering in offerings.OrderBy(o => o.DisplayOrder))
|
||||||
|
{
|
||||||
|
var slug = (offering.Slug ?? string.Empty).Trim();
|
||||||
|
var title = (offering.Title ?? string.Empty).Trim();
|
||||||
|
var features = (offering.Features ?? []).Select(f => (f ?? string.Empty).Trim()).ToList();
|
||||||
|
|
||||||
|
if (!SlugPattern().IsMatch(slug) || title.Length == 0
|
||||||
|
|| features.Count == 0 || features.Any(f => f.Length == 0)
|
||||||
|
|| WholeEuros(offering.Price) is not { } euros
|
||||||
|
|| !seen.Add(slug))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
kept.Add((offering, slug, title, euros, features));
|
||||||
|
}
|
||||||
|
|
||||||
|
return kept;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The packages as one plain list, or an empty string when no package is kept. A package is kept when its slug is
|
||||||
|
/// <c>[a-z0-9-]+</c> (the first of a duplicate wins), it has a title, at least one feature (none blank) and a price
|
||||||
|
/// that reads as whole euros above zero; the order is <c>displayOrder</c>.
|
||||||
|
/// </summary>
|
||||||
|
public static string OfferingsList(IReadOnlyList<OfferingDto> offerings)
|
||||||
|
{
|
||||||
|
var kept = Keep(offerings);
|
||||||
|
if (kept.Count == 0)
|
||||||
|
{
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
var html = new StringBuilder("<ul class=\"cms-offerings\">");
|
||||||
|
foreach (var (offering, slug, title, euros, features) in kept)
|
||||||
|
{
|
||||||
|
var name = Encode(title);
|
||||||
|
var id = Encode(slug);
|
||||||
|
html.Append("<li class=\"cms-offering\" data-slug=\"").Append(id).Append('"')
|
||||||
|
.Append(offering.Featured ? " data-featured=\"true\"" : string.Empty).Append('>')
|
||||||
|
.Append("<h3>").Append(name).Append("</h3>")
|
||||||
|
.Append("<p class=\"cms-price\">").Append(PriceHtml(euros)).Append("</p>")
|
||||||
|
.Append("<ul class=\"cms-features\">");
|
||||||
|
foreach (var feature in features)
|
||||||
|
{
|
||||||
|
html.Append("<li>").Append(Encode(feature)).Append("</li>");
|
||||||
|
}
|
||||||
|
|
||||||
|
html.Append("</ul>")
|
||||||
|
.Append("<a href=\"/?pakket=").Append(id).Append("#contact\">Boek ").Append(name).Append("</a>")
|
||||||
|
.Append("</li>");
|
||||||
|
}
|
||||||
|
|
||||||
|
return html.Append("</ul>").ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A banner as one <c><aside></c>, or an empty string for no banner. A bottom banner needs a title; a top banner
|
||||||
|
/// needs a title or a text. The link is written only when label and URL are both present and the URL is safe.
|
||||||
|
/// </summary>
|
||||||
|
public static string Banner(PublicOfferingBannerDto? banner, string position)
|
||||||
|
{
|
||||||
|
if (banner is null)
|
||||||
|
{
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
var title = (banner.Title ?? string.Empty).Trim();
|
||||||
|
var text = (banner.Text ?? string.Empty).Trim();
|
||||||
|
var label = (banner.LinkLabel ?? string.Empty).Trim();
|
||||||
|
var url = (banner.LinkUrl ?? string.Empty).Trim();
|
||||||
|
|
||||||
|
var hasContent = position == OfferingBannerPositions.Top ? title.Length > 0 || text.Length > 0 : title.Length > 0;
|
||||||
|
if (!hasContent)
|
||||||
|
{
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
var parts = new List<string>();
|
||||||
|
if (title.Length > 0) parts.Add("<strong>" + Encode(title) + "</strong>");
|
||||||
|
if (text.Length > 0) parts.Add("<span>" + Encode(text) + "</span>");
|
||||||
|
if (label.Length > 0 && url.Length > 0 && OfferingBannerLinks.IsAllowed(url))
|
||||||
|
{
|
||||||
|
parts.Add("<a href=\"" + Encode(url) + "\">" + Encode(label) + "</a>");
|
||||||
|
}
|
||||||
|
|
||||||
|
return "<aside class=\"cms-banner\">" + string.Join(' ', parts) + "</aside>";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Encodes exactly <c>& < > " '</c> (other characters, accents included, stay as they are).</summary>
|
||||||
|
public static string Encode(string text)
|
||||||
|
{
|
||||||
|
var builder = new StringBuilder(text.Length + 8);
|
||||||
|
foreach (var c in text)
|
||||||
|
{
|
||||||
|
switch (c)
|
||||||
|
{
|
||||||
|
case '&': builder.Append("&"); break;
|
||||||
|
case '<': builder.Append("<"); break;
|
||||||
|
case '>': builder.Append(">"); break;
|
||||||
|
case '"': builder.Append("""); break;
|
||||||
|
case '\'': builder.Append("'"); break;
|
||||||
|
default: builder.Append(c); break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
using SlpModularCms.Core.Hosting.Website;
|
||||||
|
using SlpModularCms.Modules.Offerings.Data.Entities;
|
||||||
|
using SlpModularCms.Modules.Offerings.Models;
|
||||||
|
|
||||||
|
namespace SlpModularCms.Modules.Offerings.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes the live packages and banners into a prerendered page (see <see cref="HtmlMarkerEditor"/> for the marker
|
||||||
|
/// formats): the plain lists in the regions, the data block the website reads instead of fetching, the price in the
|
||||||
|
/// page's JSON-LD and inline prices. It only touches what a page marks; a page without markers is not handed to it.
|
||||||
|
/// Any exception means "leave the page as it was built" (the injector logs it and serves the baked page).
|
||||||
|
/// </summary>
|
||||||
|
public sealed class OfferingsHtmlTransform(IOfferingsService offerings, IOfferingBannersService banners) : IHtmlPageTransform
|
||||||
|
{
|
||||||
|
public const string OfferingsRegion = "CMS:OFFERINGS-HTML";
|
||||||
|
public const string BannerTopRegion = "CMS:BANNER-TOP-HTML";
|
||||||
|
public const string BannerBottomRegion = "CMS:BANNER-BOTTOM-HTML";
|
||||||
|
public const string DataMarker = "CMS:DATA";
|
||||||
|
public const string DataBlockId = "cms-data";
|
||||||
|
public const string JsonLdMarker = "CMS:OFFER-JSON-LD";
|
||||||
|
public const string PriceAttribute = "data-cms-price";
|
||||||
|
|
||||||
|
// The shape of GET /api/v1/offerings and /offerings/banner: camelCase, nulls written.
|
||||||
|
private static readonly JsonSerializerOptions ApiJson = new(JsonSerializerDefaults.Web);
|
||||||
|
|
||||||
|
private static readonly JsonSerializerOptions LdJson = new()
|
||||||
|
{
|
||||||
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
|
||||||
|
};
|
||||||
|
|
||||||
|
public bool Wants(string html) => HtmlMarkerEditor.HasMarkers(html);
|
||||||
|
|
||||||
|
public async Task<string> ApplyAsync(string html, HtmlTransformContext context, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var wantsData = html.Contains("<!--" + DataMarker + "-->", StringComparison.Ordinal);
|
||||||
|
var wantsOfferings = wantsData
|
||||||
|
|| html.Contains("<!--" + OfferingsRegion + "-->", StringComparison.Ordinal)
|
||||||
|
|| html.Contains("<!--" + JsonLdMarker, StringComparison.Ordinal)
|
||||||
|
|| html.Contains(PriceAttribute + "=", StringComparison.Ordinal);
|
||||||
|
var wantsTop = wantsData || html.Contains("<!--" + BannerTopRegion + "-->", StringComparison.Ordinal);
|
||||||
|
var wantsBottom = wantsData || html.Contains("<!--" + BannerBottomRegion + "-->", StringComparison.Ordinal);
|
||||||
|
|
||||||
|
var live = wantsOfferings ? await offerings.GetOfferingsAsync() : [];
|
||||||
|
var top = wantsTop ? await banners.GetActiveAsync(OfferingBannerPositions.Top) : null;
|
||||||
|
var bottom = wantsBottom ? await banners.GetActiveAsync(OfferingBannerPositions.Bottom) : null;
|
||||||
|
|
||||||
|
if (wantsOfferings)
|
||||||
|
{
|
||||||
|
html = HtmlMarkerEditor.ReplaceRegion(html, OfferingsRegion, CmsPageHtml.OfferingsList(live));
|
||||||
|
html = HtmlMarkerEditor.EditJsonLd(html, JsonLdMarker, (slug, json) => EditOfferJsonLd(json, FindPrice(live, slug)));
|
||||||
|
html = HtmlMarkerEditor.ReplaceInlineValues(html, PriceAttribute,
|
||||||
|
slug => FindPrice(live, slug) is { } euros ? CmsPageHtml.PriceHtml(euros) : null);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wantsTop)
|
||||||
|
{
|
||||||
|
html = HtmlMarkerEditor.ReplaceRegion(html, BannerTopRegion, CmsPageHtml.Banner(top, OfferingBannerPositions.Top));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wantsBottom)
|
||||||
|
{
|
||||||
|
html = HtmlMarkerEditor.ReplaceRegion(html, BannerBottomRegion, CmsPageHtml.Banner(bottom, OfferingBannerPositions.Bottom));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wantsData)
|
||||||
|
{
|
||||||
|
html = HtmlMarkerEditor.ReplaceDataBlock(html, DataMarker, DataBlockId, DataBlock(context.SiteUrl, live, top, bottom));
|
||||||
|
}
|
||||||
|
|
||||||
|
return html;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The data block: the answers of the public API plus the address of the site, safe inside a script element.</summary>
|
||||||
|
public static string DataBlock(string siteUrl, IReadOnlyList<OfferingDto> live, PublicOfferingBannerDto? top, PublicOfferingBannerDto? bottom)
|
||||||
|
{
|
||||||
|
var json = JsonSerializer.Serialize(
|
||||||
|
new { siteUrl, offerings = live, banners = new { top, bottom } }, ApiJson);
|
||||||
|
return "<script type=\"application/json\" id=\"" + DataBlockId + "\">" + HtmlMarkerEditor.EscapeForScript(json) + "</script>";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int? FindPrice(IReadOnlyList<OfferingDto> live, string slug)
|
||||||
|
=> live.FirstOrDefault(o => string.Equals(o.Slug, slug, StringComparison.Ordinal)) is { } offering
|
||||||
|
? CmsPageHtml.WholeEuros(offering.Price)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets <c>offers.price</c> (whole euros, a JSON number) on the node of the page's JSON-LD that has an <c>offers</c>
|
||||||
|
/// object; without a price (no live package, or a price text that is no price) <c>offers</c> is removed. Returns
|
||||||
|
/// null when the text is not JSON (the baked block is left alone).
|
||||||
|
/// </summary>
|
||||||
|
internal static string? EditOfferJsonLd(string json, int? euros)
|
||||||
|
{
|
||||||
|
JsonNode? root;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
root = JsonNode.Parse(json);
|
||||||
|
}
|
||||||
|
catch (JsonException)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (root is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var holder = FindOffersHolder(root);
|
||||||
|
if (holder is null)
|
||||||
|
{
|
||||||
|
return json;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (euros is null)
|
||||||
|
{
|
||||||
|
holder.Remove("offers");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var offers = holder["offers"] is JsonArray array ? array.OfType<JsonObject>().FirstOrDefault() : holder["offers"] as JsonObject;
|
||||||
|
if (offers is null)
|
||||||
|
{
|
||||||
|
return json;
|
||||||
|
}
|
||||||
|
|
||||||
|
offers["price"] = euros.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Valid JSON never contains a literal "</script": the relaxed encoder does not escape "<", so do it here.
|
||||||
|
return root.ToJsonString(LdJson).Replace("</", "<\\/", StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static JsonObject? FindOffersHolder(JsonNode node)
|
||||||
|
{
|
||||||
|
switch (node)
|
||||||
|
{
|
||||||
|
case JsonObject obj:
|
||||||
|
if (obj["offers"] is JsonObject or JsonArray)
|
||||||
|
{
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var (_, child) in obj)
|
||||||
|
{
|
||||||
|
if (child is not null && FindOffersHolder(child) is { } found)
|
||||||
|
{
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
case JsonArray array:
|
||||||
|
foreach (var child in array)
|
||||||
|
{
|
||||||
|
if (child is not null && FindOffersHolder(child) is { } found)
|
||||||
|
{
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user