support for page queries in source path urls

lumeland · Aug 2, 2023 · 3f49875 · 3f49875
1 parent 01c269b
commit 3f49875
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ Any BREAKING CHANGE between minor versions will be documented here in upper case
 ## [1.18.4] - Unreleased
 ### Added
 - Generic to `Page` to set the data interface. For example: `Page<Post>`.
+- Support for multiple generated pages for `site.url()`.
+  For example: `site.url("~/multilanguage.tmpl.js(lang=en)")` returns the page with `lang=en` among all pages generated by this file.
 
 ## [1.18.3] - 2023-07-26
 ### Fixed

diff --git a/core/site.ts b/core/site.ts
@@ -718,9 +718,16 @@ export default class Site {
     if (path.startsWith("~/")) {
       path = decodeURI(path.slice(1));
 
+      // Has a search query
+      const match = path.match(/^(.*)\s*\(([^)]+)\)$/);
+      const srcPath = match ? match[1] : path;
+      const pages = match
+        ? this.searcher.pages(match[2]).map<Page>((data) => data.page!)
+        : this.pages;
+
       // It's a page
-      const page = this.pages.find((page) =>
-        page.src.path + page.src.ext === path
+      const page = pages.find((page) =>
+        page.src.path + page.src.ext === srcPath
       );
 
       if (page) {

diff --git a/tests/__snapshots__/multilanguage.test.ts.snap b/tests/__snapshots__/multilanguage.test.ts.snap
@@ -188,11 +188,11 @@ snapshot[`multilanguage plugin 3`] = `
 ' +
       '<link rel="alternate" hreflang="fr" href="http://localhost/fr/other-page-french.html">
 ' +
-      "</head><body><p>Other page</p></body></html>",
+      '</head><body><p>Other page <a href="/gl/">Link to index in Galego</a></p></body></html>',
     data: {
       alternates: "Array(2)",
-      children: "<p>Other page</p>",
-      content: "<p>Other page</p>",
+      children: '<p>Other page <a href="/gl/">Link to index in Galego</a></p>',
+      content: \`<p>Other page <a href="{{ '~/index.md(lang=gl)' | url }}">Link to index in Galego</a></p>\`,
       date: [],
       id: "other",
       lang: "en",
@@ -228,11 +228,11 @@ snapshot[`multilanguage plugin 3`] = `
 ' +
       '<link rel="alternate" hreflang="fr" href="http://localhost/fr/other-page-french.html">
 ' +
-      "</head><body><p>Other page</p></body></html>",
+      '</head><body><p>Other page <a href="/gl/">Link to index in Galego</a></p></body></html>',
     data: {
       alternates: "Array(2)",
-      children: "<p>Other page</p>",
-      content: "<p>Other page</p>",
+      children: '<p>Other page <a href="/gl/">Link to index in Galego</a></p>',
+      content: \`<p>Other page <a href="{{ '~/index.md(lang=gl)' | url }}">Link to index in Galego</a></p>\`,
       date: [],
       id: "other",
       lang: "fr",

diff --git a/tests/assets/multilanguage/other.njk b/tests/assets/multilanguage/other.njk
@@ -8,4 +8,4 @@ fr:
   url: /other-page-french.html
 ---
 
-<p>Other page</p>
+<p>Other page <a href="{{ '~/index.md(lang=gl)' | url }}">Link to index in Galego</a></p>