@rr0/cms 0.3.56 → 0.3.58

package/dist/DataContentVisitor.js

@@ -65,12 +65,16 @@ export class DataContentVisitor {
         const doc = context.file.document;
         const contents = doc.querySelector(".contents");
         if (contents) {
-            const imgEl = contents.querySelector("img");
             const eventCaption = event.name;
-            const eventSsrc = event.url;
-            if (imgEl && ![imgEl.src, path.join("/", path.dirname(context.file.name), imgEl.src)].includes(eventSsrc)) {
+            const eventSrc = event.url;
+            const absoluteEventSrc = path.join("/", path.dirname(context.file.name), eventSrc);
+            const imageAlreadyRendered = Array.from(contents.querySelectorAll("img")).some(imgEl => {
+                const imageSrc = imgEl.getAttribute("src");
+                return imageSrc === eventSrc || imageSrc === absoluteEventSrc;
+            });
+            if (!imageAlreadyRendered) {
                 const imgEl = doc.createElement("img");
-                imgEl.src = eventSsrc;
+                imgEl.src = eventSrc;
                 imgEl.alt = event.title;
                 const figcaptionEl = doc.createElement("figcaption");
                 figcaptionEl.innerHTML = eventCaption;

package/dist/DataContentVisitor.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/DataContentVisitor.test.js

@@ -0,0 +1,34 @@
+import { describe, expect, test } from "@javarome/testscript";
+import { DataContentVisitor } from "./DataContentVisitor.js";
+import { cmsTestUtil } from "./test/index.js";
+class TestDataContentVisitor extends DataContentVisitor {
+    constructor() {
+        super(undefined, { renderEnd: async () => undefined }, undefined);
+    }
+    renderImage(context, event) {
+        return this.processImage(context, event);
+    }
+}
+describe("DataContentVisitor", () => {
+    const portraitEvent = {
+        eventType: "image",
+        name: "Portrait",
+        title: "Louis de Broglie",
+        url: "portrait.jpg"
+    };
+    test("insert portrait image when contents has no image", async () => {
+        var _a, _b;
+        const context = cmsTestUtil.newHtmlContext("people/v/VertongenJeanLuc/index.html", '<div class="contents"><p>Biographie</p></div>');
+        const visitor = new TestDataContentVisitor();
+        await visitor.renderImage(context, portraitEvent);
+        const figure = context.file.document.querySelector(".contents > figure");
+        expect((_a = figure === null || figure === void 0 ? void 0 : figure.querySelector("img")) === null || _a === void 0 ? void 0 : _a.getAttribute("src")).toBe("portrait.jpg");
+        expect((_b = figure === null || figure === void 0 ? void 0 : figure.querySelector("figcaption")) === null || _b === void 0 ? void 0 : _b.textContent).toBe("Portrait");
+    });
+    test("does not insert a portrait image already present", async () => {
+        const context = cmsTestUtil.newHtmlContext("people/v/VertongenJeanLuc/index.html", '<div class="contents"><img src="portrait.jpg"><p>Biographie</p></div>');
+        const visitor = new TestDataContentVisitor();
+        await visitor.renderImage(context, portraitEvent);
+        expect(context.file.document.querySelectorAll('.contents img[src="portrait.jpg"]').length).toBe(1);
+    });
+});

package/dist/lang/RR0Messages_fr.d.ts

@@ -46,97 +46,7 @@ export declare class RR0Messages_fr implements RR0Messages {
         conclusion: CaseConclusionMessages;
     };
     org: import("../org/OrgRR0Messages.js").OrgRR0Messages;
-    people: {
-        birth: string;
-        death: string;
-        occupation: {
-            abductee: (gender: import("@rr0/common").Gender) => "enlevé" | "enlevée";
-            actor: (gender: import("@rr0/common").Gender) => "acteur" | "actrice";
-            anthropologist: (_gender: import("@rr0/common").Gender) => string;
-            archeologist: (_gender: import("@rr0/common").Gender) => string;
-            artist: (_gender: import("@rr0/common").Gender) => string;
-            astronaut: (_gender: import("@rr0/common").Gender) => string;
-            astronomer: (_gender: import("@rr0/common").Gender) => string;
-            astrologist: (_gender: import("@rr0/common").Gender) => string;
-            astrophysicist: (gender: import("@rr0/common").Gender) => "astrophysicien" | "astrophysicienne";
-            banker: (gender: import("@rr0/common").Gender) => "banquier" | "banquière";
-            barman: (gender: import("@rr0/common").Gender) => "barman" | "barmaid";
-            biologist: (_gender: import("@rr0/common").Gender) => string;
-            biochemist: (_gender: import("@rr0/common").Gender) => string;
-            biophysicist: (gender: import("@rr0/common").Gender) => "biophysicien" | "biophysicienne";
-            bishop: (_gender: import("@rr0/common").Gender) => string;
-            botanist: (_gender: import("@rr0/common").Gender) => string;
-            businessman: (gender: import("@rr0/common").Gender) => "homme d'affaires" | "femme d'affaires";
-            cameraman: (gender: import("@rr0/common").Gender) => "cadreur" | "cadreuse";
-            chemist: (_gender: import("@rr0/common").Gender) => string;
-            contactee: (gender: import("@rr0/common").Gender) => "contacté" | "contactée";
-            cryptozoologist: (_gender: import("@rr0/common").Gender) => string;
-            dentist: (_gender: import("@rr0/common").Gender) => string;
-            diplomat: (_gender: import("@rr0/common").Gender) => string;
-            director: (_gender: import("@rr0/common").Gender) => string;
-            diver: (_gender: import("@rr0/common").Gender) => string;
-            engineer: (_gender: import("@rr0/common").Gender) => string;
-            electronics: (gender: import("@rr0/common").Gender) => "électronicien" | "électronicienne";
-            ethnologist: (_gender: import("@rr0/common").Gender) => string;
-            exobiologist: (_gender: import("@rr0/common").Gender) => string;
-            farmer: (gender: import("@rr0/common").Gender) => "agriculteur" | "agricultrice";
-            firefighter: (gender: import("@rr0/common").Gender) => "pompier" | "pompière";
-            flightAttendant: (gender: import("@rr0/common").Gender) => "stewart" | "hôtesse de l'air";
-            geographer: (_gender: import("@rr0/common").Gender) => string;
-            geologist: (_gender: import("@rr0/common").Gender) => string;
-            geophysicist: (gender: import("@rr0/common").Gender) => "géophysicien" | "géophysicienne";
-            historian: (gender: import("@rr0/common").Gender) => "historien" | "historienne";
-            houseWife: (_gender: import("@rr0/common").Gender) => string;
-            hypnotherapist: (_gender: import("@rr0/common").Gender) => string;
-            illusionist: (_gender: import("@rr0/common").Gender) => string;
-            journalist: (_gender: import("@rr0/common").Gender) => string;
-            judge: (_gender: import("@rr0/common").Gender) => string;
-            lawyer: (gender: import("@rr0/common").Gender) => "avocat" | "avocate";
-            librarian: (_gender: import("@rr0/common").Gender) => string;
-            leader: (gender: import("@rr0/common").Gender) => "dirigeant" | "dirigeante";
-            logger: (gender: import("@rr0/common").Gender) => "bucheron" | "bucheronne";
-            mathematician: (gender: import("@rr0/common").Gender) => "mathématicien" | "mathématicienne";
-            meteorologist: (_gender: import("@rr0/common").Gender) => string;
-            mechanic: (gender: import("@rr0/common").Gender) => "mécanicien" | "mécanicienne";
-            military: (_gender: import("@rr0/common").Gender) => string;
-            musician: (gender: import("@rr0/common").Gender) => "musicien" | "musicienne";
-            neurologist: (_gender: import("@rr0/common").Gender) => string;
-            neuroscientist: (_gender: import("@rr0/common").Gender) => string;
-            neuropsychiatrist: (_gender: import("@rr0/common").Gender) => string;
-            nurse: (gender: import("@rr0/common").Gender) => "infirmier" | "infirmière";
-            oceanographer: (_gender: import("@rr0/common").Gender) => string;
-            painter: (_gender: import("@rr0/common").Gender) => string;
-            parapsychologist: (_gender: import("@rr0/common").Gender) => string;
-            philosopher: (_gender: import("@rr0/common").Gender) => string;
-            photographer: (_gender: import("@rr0/common").Gender) => string;
-            physicist: (gender: import("@rr0/common").Gender) => "physicien" | "physicienne";
-            physician: (_gender: import("@rr0/common").Gender) => string;
-            pilot: (_gender: import("@rr0/common").Gender) => string;
-            policeman: (gender: import("@rr0/common").Gender) => "policier" | "policière";
-            politician: (gender: import("@rr0/common").Gender) => "politicien" | "politicienne";
-            priest: (gender: import("@rr0/common").Gender) => "prêtre" | "prêtresse";
-            producer: (gender: import("@rr0/common").Gender) => "producteur" | "productrice";
-            prospector: (gender: import("@rr0/common").Gender) => "prospecteur" | "prospectrice";
-            psychologist: (_gender: import("@rr0/common").Gender) => string;
-            psychiatrist: (_gender: import("@rr0/common").Gender) => string;
-            radioastronomer: (_gender: import("@rr0/common").Gender) => string;
-            radioamateur: (gender: import("@rr0/common").Gender) => "radio amateur" | "radio amatrice";
-            sailor: (_gender: import("@rr0/common").Gender) => string;
-            salesman: (gender: import("@rr0/common").Gender) => "commercial" | "commerciale";
-            sociologist: (_gender: import("@rr0/common").Gender) => string;
-            softwareEngineer: (_gender: import("@rr0/common").Gender) => string;
-            stuntman: (_gender: import("@rr0/common").Gender) => string;
-            teacher: (gender: import("@rr0/common").Gender) => "enseignant" | "enseignante";
-            truckDriver: (gender: import("@rr0/common").Gender) => "camionneur" | "camionneuse";
-            taxiDriver: (_gender: import("@rr0/common").Gender) => string;
-            telegrapher: (_gender: import("@rr0/common").Gender) => string;
-            ufologist: (_gender: import("@rr0/common").Gender) => string;
-            ufoWitness: (_gender: import("@rr0/common").Gender) => string;
-            ufoWitness2: (_gender: import("@rr0/common").Gender) => string;
-            worker: (gender: import("@rr0/common").Gender) => "ouvrier" | "ouvrière";
-            writer: (gender: import("@rr0/common").Gender) => "écrivain" | "écrivaine";
-        };
-    };
+    people: import("../people/PeopleMessages.js").PeopleMessages;
     place: import("@rr0/place").PlaceMessages;
     country: import("../org/CountryMessagesList.js").CountryMessagesList;
     nav: {

package/dist/people/PeopleMessages_fr.d.ts

@@ -1,92 +1,2 @@
-import { Gender } from "@rr0/common";
-export declare let peopleMessages_fr: {
-    birth: string;
-    death: string;
-    occupation: {
-        abductee: (gender: Gender) => "enlevé" | "enlevée";
-        actor: (gender: Gender) => "acteur" | "actrice";
-        anthropologist: (_gender: Gender) => string;
-        archeologist: (_gender: Gender) => string;
-        artist: (_gender: Gender) => string;
-        astronaut: (_gender: Gender) => string;
-        astronomer: (_gender: Gender) => string;
-        astrologist: (_gender: Gender) => string;
-        astrophysicist: (gender: Gender) => "astrophysicien" | "astrophysicienne";
-        banker: (gender: Gender) => "banquier" | "banquière";
-        barman: (gender: Gender) => "barman" | "barmaid";
-        biologist: (_gender: Gender) => string;
-        biochemist: (_gender: Gender) => string;
-        biophysicist: (gender: Gender) => "biophysicien" | "biophysicienne";
-        bishop: (_gender: Gender) => string;
-        botanist: (_gender: Gender) => string;
-        businessman: (gender: Gender) => "homme d'affaires" | "femme d'affaires";
-        cameraman: (gender: Gender) => "cadreur" | "cadreuse";
-        chemist: (_gender: Gender) => string;
-        contactee: (gender: Gender) => "contacté" | "contactée";
-        cryptozoologist: (_gender: Gender) => string;
-        dentist: (_gender: Gender) => string;
-        diplomat: (_gender: Gender) => string;
-        director: (_gender: Gender) => string;
-        diver: (_gender: Gender) => string;
-        engineer: (_gender: Gender) => string;
-        electronics: (gender: Gender) => "électronicien" | "électronicienne";
-        ethnologist: (_gender: Gender) => string;
-        exobiologist: (_gender: Gender) => string;
-        farmer: (gender: Gender) => "agriculteur" | "agricultrice";
-        firefighter: (gender: Gender) => "pompier" | "pompière";
-        flightAttendant: (gender: Gender) => "stewart" | "hôtesse de l'air";
-        geographer: (_gender: Gender) => string;
-        geologist: (_gender: Gender) => string;
-        geophysicist: (gender: Gender) => "géophysicien" | "géophysicienne";
-        historian: (gender: Gender) => "historien" | "historienne";
-        houseWife: (_gender: Gender) => string;
-        hypnotherapist: (_gender: Gender) => string;
-        illusionist: (_gender: Gender) => string;
-        journalist: (_gender: Gender) => string;
-        judge: (_gender: Gender) => string;
-        lawyer: (gender: Gender) => "avocat" | "avocate";
-        librarian: (_gender: Gender) => string;
-        leader: (gender: Gender) => "dirigeant" | "dirigeante";
-        logger: (gender: Gender) => "bucheron" | "bucheronne";
-        mathematician: (gender: Gender) => "mathématicien" | "mathématicienne";
-        meteorologist: (_gender: Gender) => string;
-        mechanic: (gender: Gender) => "mécanicien" | "mécanicienne";
-        military: (_gender: Gender) => string;
-        musician: (gender: Gender) => "musicien" | "musicienne";
-        neurologist: (_gender: Gender) => string;
-        neuroscientist: (_gender: Gender) => string;
-        neuropsychiatrist: (_gender: Gender) => string;
-        nurse: (gender: Gender) => "infirmier" | "infirmière";
-        oceanographer: (_gender: Gender) => string;
-        painter: (_gender: Gender) => string;
-        parapsychologist: (_gender: Gender) => string;
-        philosopher: (_gender: Gender) => string;
-        photographer: (_gender: Gender) => string;
-        physicist: (gender: Gender) => "physicien" | "physicienne";
-        physician: (_gender: Gender) => string;
-        pilot: (_gender: Gender) => string;
-        policeman: (gender: Gender) => "policier" | "policière";
-        politician: (gender: Gender) => "politicien" | "politicienne";
-        priest: (gender: Gender) => "prêtre" | "prêtresse";
-        producer: (gender: Gender) => "producteur" | "productrice";
-        prospector: (gender: Gender) => "prospecteur" | "prospectrice";
-        psychologist: (_gender: Gender) => string;
-        psychiatrist: (_gender: Gender) => string;
-        radioastronomer: (_gender: Gender) => string;
-        radioamateur: (gender: Gender) => "radio amateur" | "radio amatrice";
-        sailor: (_gender: Gender) => string;
-        salesman: (gender: Gender) => "commercial" | "commerciale";
-        sociologist: (_gender: Gender) => string;
-        softwareEngineer: (_gender: Gender) => string;
-        stuntman: (_gender: Gender) => string;
-        teacher: (gender: Gender) => "enseignant" | "enseignante";
-        truckDriver: (gender: Gender) => "camionneur" | "camionneuse";
-        taxiDriver: (_gender: Gender) => string;
-        telegrapher: (_gender: Gender) => string;
-        ufologist: (_gender: Gender) => string;
-        ufoWitness: (_gender: Gender) => string;
-        ufoWitness2: (_gender: Gender) => string;
-        worker: (gender: Gender) => "ouvrier" | "ouvrière";
-        writer: (gender: Gender) => "écrivain" | "écrivaine";
-    };
-};
+import { PeopleMessages } from "./PeopleMessages.js";
+export declare let peopleMessages_fr: PeopleMessages;

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

@@ -73,6 +73,16 @@ describe("TimeReplacer", async () => {
         expect(context.time.getMinutes()).toBe(undefined);
         expect(context.time.getTimeZone()).toBe(undefined);
     });
+    test("renders a year interval after a more precise date in the same year", async () => {
+        const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+        const previous = context.file.document.createElement("time");
+        previous.textContent = "1951-05";
+        await replacer.replacement(context, previous);
+        const interval = context.file.document.createElement("time");
+        interval.textContent = "1951/1955";
+        const replaced = await replacer.replacement(context, interval);
+        expect(replaced.outerHTML).toBe(`<span class="time-interval"><span class="time-resolved"><time datetime="1951">1951</time></span> à <span class="time-resolved"><time datetime="1955">1955</time></span></span>`);
+    });
     test("parses unsupported", async () => {
         const interval = "moi";
         const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");

package/dist/time/text/TimeTextBuilder.js

@@ -43,6 +43,24 @@ export class TimeTextBuilder {
         if (timeZone) {
             // printOptions.timeZoneName = context.time.options.timeZoneName
         }
+        if (!Object.values(printOptions).some(value => value !== undefined)) {
+            if (year) {
+                printOptions.year = this.options.year;
+            }
+            if (month) {
+                printOptions.month = this.options.month;
+            }
+            if (dayOfMonth) {
+                printOptions.day = this.options.day;
+                printOptions.weekday = this.options.weekday;
+            }
+            if (hour) {
+                printOptions.hour = this.options.hour;
+            }
+            if (minutes) {
+                printOptions.minute = this.options.minute;
+            }
+        }
         let text;
         if (Number.isNaN(date.getTime())) {
             text = "";

package/package.json

@@ -2,9 +2,8 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.56",
+  "version": "0.3.58",
   "description": "RR0 Content Management System (CMS)",
-
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "engines": {