@rr0/cms 0.3.74 → 0.3.75

package/dist/time/RR0TimeMessages.d.ts

@@ -31,6 +31,11 @@ export type RR0TimeMessages = {
      * The word that, written right before an interval, asks for it to be rendered as `betweenAnd` ("between", "entre").
      */
     between: RegExp;
+    /**
+     * The words that, written right before a time, need it rendered in full: a relative wording can't follow them
+     * ("en l'année suivante", "in the year after").
+     */
+    preposition: RegExp;
     betweenAnd(startReplacement: string, endReplacement: string): string;
     on(approximate: boolean): string;
     in(approximate: boolean): string;

package/dist/time/RR0TimeMessages_en.d.ts

@@ -31,6 +31,7 @@ export declare class RR0TimeMessages_en implements RR0TimeMessages {
     in: (approximate: boolean) => string;
     fromTo: (startReplacement: string, endReplacement: string) => string;
     between: RegExp;
+    preposition: RegExp;
     betweenAnd: (startReplacement: string, endReplacement: string) => string;
     starting: (approximate: boolean) => string;
 }

package/dist/time/RR0TimeMessages_en.js

@@ -34,6 +34,7 @@ export class RR0TimeMessages_en {
         this.in = (approximate) => (approximate ? "around " : "");
         this.fromTo = (startReplacement, endReplacement) => startReplacement + " to " + endReplacement;
         this.between = /\bbetween\s*$/i;
+        this.preposition = /\b(?:in|on|at|from|to|until|till|since|by|before|after|during|of|for|between|the)\s*$/i;
         this.betweenAnd = (startReplacement, endReplacement) => startReplacement + " and " + endReplacement;
         this.starting = (approximate) => "starting " + (approximate ? "" : "the ");
     }

package/dist/time/RR0TimeMessages_fr.d.ts

@@ -31,6 +31,7 @@ export declare class RR0TimeMessages_fr implements RR0TimeMessages {
     in: (approximate: boolean) => string;
     fromTo: (startReplacement: string, endReplacement: string) => string;
     between: RegExp;
+    preposition: RegExp;
     betweenAnd: (startReplacement: string, endReplacement: string) => string;
     starting: (approximate: boolean) => string;
 }

package/dist/time/RR0TimeMessages_fr.js

@@ -34,6 +34,7 @@ export class RR0TimeMessages_fr {
         this.in = (approximate) => (approximate ? "vers " : "en ");
         this.fromTo = (startReplacement, endReplacement) => `${startReplacement} à ${endReplacement}`;
         this.between = /\bentre\s*$/i;
+        this.preposition = /(?:^|[^\p{L}])(?:(?:en|de|du|des|à|au|aux|jusque|dès|depuis|vers|avant|après|pour|par|fin|début|entre|le|la|les|ce|cet|cette)\s*|(?:d|l|jusqu|qu)['’]\s*|mi-\s*)$/iu;
         this.betweenAnd = (startReplacement, endReplacement) => `${startReplacement} et ${endReplacement}`;
         this.starting = (approximate) => "à partir " + (approximate ? "de " : "du ");
     }

package/dist/time/html/TimeReplacer.js

@@ -33,11 +33,14 @@ export class TimeReplacer {
             const previousContext = origEl.dataset.context === "none" ? undefined : context.clone();
             const timeStr = origEl.textContent;
             const { prefix, value, suffix } = this.completer.split(timeStr);
-            const between = context.messages.context.time.between.test(TimeReplacer.precedingText(origEl) + prefix);
+            const preceding = TimeReplacer.precedingText(origEl) + prefix;
+            const between = context.messages.context.time.between.test(preceding);
+            // "en l'année suivante" is not French: after a preposition, the time is rendered in full
+            const relativeWords = !context.messages.context.time.preposition.test(preceding);
             // A <time> already inside a link keeps that link: a link of its own would nest <a> in <a>, which the HTML
             // parser splits, closing the enclosing elements (a note, a source) early.
             const url = !origEl.closest("a");
-            const options = { url, contentOnly: true, between };
+            const options = { url, contentOnly: true, between, relativeWords };
             try {
                 const durations = /^(~?)P([^/]+)\/P?([^/]+)$/.exec(value.trim()); // "P10M/12M"
                 if (durations) {

package/dist/time/html/TimeReplacer.test.js

@@ -213,6 +213,30 @@ describe("TimeReplacer", async () => {
         const replacement2 = await replacer.replacement(context, original);
         expect(replacement2.outerHTML).toBe(`<span class="time-resolved"><a href="${cmsTestUtil.time.url("2/0/0/6/")}"><time datetime="${datetime}" title="2006">l'année suivante</time></a></span>`);
     });
+    describe("renders a time in full after a preposition", () => {
+        async function renderAfter(locale, html) {
+            const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "", locale);
+            const p = context.file.document.createElement("p");
+            p.innerHTML = html;
+            const times = p.querySelectorAll("time");
+            let replaced;
+            for (const time of times) {
+                replaced = await replacer.replacement(context, time);
+            }
+            return replaced.textContent;
+        }
+        test("in French", async () => {
+            expect(await renderAfter("fr", "<time>2005</time>. En <time>2006</time>")).toBe("2006");
+            expect(await renderAfter("fr", "<time>2005</time>, jusqu'à <time>2006</time>")).toBe("2006");
+            expect(await renderAfter("fr", "<time>2005</time>, d’<time>2006</time>")).toBe("2006");
+        });
+        test("in English", async () => {
+            expect(await renderAfter("en", "<time>2005</time>. In <time>2006</time>")).toBe("2006");
+        });
+        test("but not without one", async () => {
+            expect(await renderAfter("fr", "<time>2005</time>. Puis, <time>2006</time>")).toBe("l'année suivante");
+        });
+    });
     test("avoids linking to current file", async () => {
         const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
         const timeEl = context.file.document.createElement("time");

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.74",
+  "version": "0.3.75",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.9",
     "@rr0/common": "^1.1.5",
-    "@rr0/data": "^0.3.43",
+    "@rr0/data": "^0.3.45",
     "@rr0/lang": "^0.1.13",
     "@rr0/place": "^0.5.4",
     "@rr0/time": "^0.11.3",