@rr0/cms 0.3.71 → 0.3.72

package/dist/time/html/TimeReplacer.js

@@ -24,7 +24,7 @@ export class TimeReplacer {
     }
     async replacement(context, origEl) {
         let replacement;
-        if (origEl.dateTime) { // Already done?
+        if (origEl.dateTime || origEl.dataset.format === "none") { // Already done, or not to be interpreted
             replacement = origEl;
         }
         else {
@@ -32,7 +32,13 @@ export class TimeReplacer {
             const timeStr = origEl.textContent;
             const valid = context.time.updateFromStr(timeStr);
             const between = context.messages.context.time.between.test(TimeReplacer.precedingText(origEl));
-            replacement = valid && this.factory.create(context, previousContext, { url: true, contentOnly: true, between });
+            try {
+                replacement = valid && this.factory.create(context, previousContext, { url: true, contentOnly: true, between });
+            }
+            catch (e) { // One unrenderable time must not stop the others of the page
+                context.warn("Could not render time", timeStr, e.message);
+                replacement = undefined;
+            }
             if (!replacement) {
                 replacement = origEl;
                 // replacement.setAttribute("datetime", context.time.toString())

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

@@ -102,6 +102,36 @@ describe("TimeReplacer", async () => {
             expect(await renderIn("en", "from <time>1951/1955</time>")).toBe("1951 to 1955");
         });
     });
+    describe("renders an EDTF season", () => {
+        async function render(locale, value) {
+            const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "", locale);
+            const el = context.file.document.createElement("time");
+            el.textContent = value;
+            return (await replacer.replacement(context, el)).textContent;
+        }
+        test("in French and English, instead of failing on month 23", async () => {
+            expect(await render("fr", "1954-23")).toBe("automne 1954");
+            expect(await render("en", "1954-22")).toBe("summer 1954");
+        });
+        test("after another date", async () => {
+            const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+            const previous = context.file.document.createElement("time");
+            previous.textContent = "1954-10-16";
+            await replacer.replacement(context, previous);
+            const season = context.file.document.createElement("time");
+            season.textContent = "1954-24";
+            expect((await replacer.replacement(context, season)).textContent).toBe("hiver 1954");
+        });
+    });
+    test("leaves a time with data-format=\"none\" as written", async () => {
+        const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+        const el = context.file.document.createElement("time");
+        el.dataset.format = "none";
+        el.textContent = "Dans la nuit";
+        const replaced = await replacer.replacement(context, el);
+        expect(replaced).toBe(el);
+        expect(replaced.outerHTML).toBe(`<time data-format="none">Dans la nuit</time>`);
+    });
     test("parses unsupported", async () => {
         const interval = "moi";
         const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");

package/dist/time/text/RelativeTimeTextBuilder.js

@@ -1,3 +1,4 @@
+import { TimeTextBuilder } from "./TimeTextBuilder.js";
 import { Level0Duration } from "@rr0/time";
 export class RelativeTimeTextBuilder {
     constructor(timeTextBuilder) {
@@ -9,6 +10,9 @@ export class RelativeTimeTextBuilder {
         const time = newContext.time;
         const previousTime = time.equals(oldContext === null || oldContext === void 0 ? void 0 : oldContext.time) ? undefined : oldContext.time;
         let options;
+        if (TimeTextBuilder.isSeason(time.getMonth()) || TimeTextBuilder.isSeason(previousTime === null || previousTime === void 0 ? void 0 : previousTime.getMonth())) {
+            return undefined; // A season has no position within a year: always render it in full
+        }
         if (previousTime === null || previousTime === void 0 ? void 0 : previousTime.isDefined()) {
             options = {};
             const deltaMs = time.date.compare(previousTime.date);

package/dist/time/text/TimeTextBuilder.d.ts

@@ -1,6 +1,11 @@
 import { RR0Context } from "../../RR0Context.js";
 export declare class TimeTextBuilder {
     readonly options: Intl.DateTimeFormatOptions;
+    /**
+     * EDTF season codes (21-24) and their names, per language.
+     */
+    static readonly seasons: Record<string, Record<number, string>>;
+    static isSeason(month: number | undefined): boolean;
     /**
      * @param options The default date format.to use.
      */

package/dist/time/text/TimeTextBuilder.js

@@ -1,4 +1,7 @@
 export class TimeTextBuilder {
+    static isSeason(month) {
+        return month >= 21 && month <= 24;
+    }
     /**
      * @param options The default date format.to use.
      */
@@ -9,10 +12,16 @@ export class TimeTextBuilder {
      * Build a textual representation of context's time, according to context's locale.
      */
     build(context, options = this.options) {
+        var _a;
         const time = context.time;
         const printOptions = {};
         const date = new Date(undefined, undefined, undefined);
         const year = time.getYear();
+        const season = time.getMonth();
+        if (TimeTextBuilder.isSeason(season)) { // "1954-23": no Date can hold it
+            const names = (_a = TimeTextBuilder.seasons[context.locale]) !== null && _a !== void 0 ? _a : TimeTextBuilder.seasons.en;
+            return year ? `${names[season]} ${year}` : names[season];
+        }
         if (year) {
             date.setFullYear(year);
             printOptions.year = options.year;
@@ -79,3 +88,10 @@ export class TimeTextBuilder {
         return text;
     }
 }
+/**
+ * EDTF season codes (21-24) and their names, per language.
+ */
+TimeTextBuilder.seasons = {
+    fr: { 21: "printemps", 22: "été", 23: "automne", 24: "hiver" },
+    en: { 21: "spring", 22: "summer", 23: "autumn", 24: "winter" }
+};

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.71",
+  "version": "0.3.72",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",