@rr0/cms 0.2.2 → 0.2.4

package/dist/RR0Build.js

@@ -31,6 +31,7 @@ import { writeFile } from "@javarome/fileutil";
 import { AllDataService, EventDataFactory, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { GooglePlaceService } from "@rr0/place";
 import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping";
+import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer";
 const outputFunc = async (context, outFile) => {
     try {
         if (context.file instanceof HtmlFileContents) {
@@ -100,7 +101,8 @@ export class RR0Build {
         const ufoCaseDirectoryFile = this.options.ufoCaseDirectoryFile;
         const ufoCasesExclusions = this.options.ufoCasesExclusions;
         const ufoCasesStep = new CaseDirectoryStep(caseService, caseService.files, ufoCasesExclusions, ufoCaseDirectoryFile, outputFunc, config);
-        const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, config, peopleService, this.options.directoryExcluded);
+        const peopleRenderer = new PeopleHtmlRenderer();
+        const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, config, peopleService, peopleRenderer, this.options.directoryExcluded);
         const directoryOptions = this.options.directoryOptions;
         for (const directoryOption in directoryOptions) {
             directoryOptions[directoryOption] = directoryOptions[directoryOption];
@@ -173,7 +175,7 @@ export class RR0Build {
             new ClassDomReplaceCommand(sourceReplacerFactory, "source"),
             new DomReplaceCommand("time", new TimeReplacerFactory(timeReplacer)),
             new DomReplaceCommand("code", new CodeReplacerFactory()),
-            new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService), "people"),
+            new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService, peopleRenderer), "people"),
             new ClassDomReplaceCommand(new PlaceReplacerFactory(), "place"),
             new ClassDomReplaceCommand(new WitnessReplacerFactory(), "temoin", "temoin1", "temoin2", "temoin3"),
             new ClassDomReplaceCommand(noteReplacerFactory, "note"),

package/dist/people/PeopleDirectoryStep.d.ts

@@ -4,6 +4,7 @@ import { HtmlRR0Context } from "../RR0Context.js";
 import { DirectoryStep, FileWriteConfig, OutputFunc } from "ssg-api";
 import { PeopleService } from "./PeopleService.js";
 import { CountryCode } from "../org/country/CountryCode.js";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 export type PeopleFilter = (p: People) => boolean;
 export declare function peopleOccupationFilter(filterOccupations: Occupation[]): PeopleFilter;
 /**
@@ -12,8 +13,9 @@ export declare function peopleOccupationFilter(filterOccupations: Occupation[]):
 export declare class PeopleDirectoryStep extends DirectoryStep {
     protected outputFunc: OutputFunc;
     protected service: PeopleService;
+    protected renderer: PeopleHtmlRenderer;
     protected filter: PeopleFilter;
-    constructor(name: string, rootDirs: string[], excludedDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, filter?: PeopleFilter);
+    constructor(name: string, rootDirs: string[], excludedDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, renderer: PeopleHtmlRenderer, filter?: PeopleFilter);
     protected processDirs(context: HtmlRR0Context, dirNames: string[]): Promise<void>;
     protected toList(context: HtmlRR0Context, peopleList: People[], pseudoPeopleList: People[], allCountries: Set<CountryCode>, occupations: Set<Occupation>): HTMLUListElement;
     protected toListItem(context: HtmlRR0Context, people: People, pseudoPeopleList: People[], allCountries: Set<CountryCode>, occupations: Set<Occupation>): HTMLLIElement;

package/dist/people/PeopleDirectoryStep.js

@@ -10,10 +10,11 @@ export function peopleOccupationFilter(filterOccupations) {
  * Scan directories for people information, then populates a template with collected data.
  */
 export class PeopleDirectoryStep extends DirectoryStep {
-    constructor(name, rootDirs, excludedDirs, templateFileName, outputFunc, config, service, filter = (_people) => true) {
+    constructor(name, rootDirs, excludedDirs, templateFileName, outputFunc, config, service, renderer, filter = (_people) => true) {
         super({ rootDirs, excludedDirs, templateFileName, getOutputPath: config.getOutputPath }, name);
         this.outputFunc = outputFunc;
         this.service = service;
+        this.renderer = renderer;
         this.filter = filter;
     }
     async processDirs(context, dirNames) {
@@ -70,7 +71,7 @@ export class PeopleDirectoryStep extends DirectoryStep {
         return ul;
     }
     toListItem(context, people, pseudoPeopleList, allCountries, occupations) {
-        const ref = this.service.getLink(context, people, pseudoPeopleList, allCountries, occupations
+        const ref = this.renderer.renderLink(context, people, pseudoPeopleList, allCountries, occupations
         /*this.filter*/ // TODO: Restore removal of already-known (as from people occupation subset) occupation
         );
         const item = context.file.document.createElement("li");

package/dist/people/PeopleDirectoryStepFactory.d.ts

@@ -1,6 +1,7 @@
 import { FileWriteConfig, OutputFunc } from "ssg-api";
 import { PeopleService } from "./PeopleService.js";
 import { PeopleDirectoryStep } from "./PeopleDirectoryStep.js";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 export type PeopleDirectoryStepOptions = {
     root: string;
     scientists?: string;
@@ -21,8 +22,9 @@ export declare class PeopleDirectoryStepFactory {
     protected outputFunc: OutputFunc;
     protected config: FileWriteConfig;
     protected service: PeopleService;
+    protected renderer: PeopleHtmlRenderer;
     protected excludedDirs: string[];
-    constructor(outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, excludedDirs: string[]);
+    constructor(outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, renderer: PeopleHtmlRenderer, excludedDirs: string[]);
     create(options: PeopleDirectoryStepOptions): Promise<PeopleDirectoryStep[]>;
     createLetters(): Promise<PeopleDirectoryStep[]>;
     createAll(dirs: string[], templateFileName: string): PeopleDirectoryStep;

package/dist/people/PeopleDirectoryStepFactory.js

@@ -7,10 +7,11 @@ import path from "path";
  * Scan directories for people information, then populates a template with collected data.
  */
 export class PeopleDirectoryStepFactory {
-    constructor(outputFunc, config, service, excludedDirs) {
+    constructor(outputFunc, config, service, renderer, excludedDirs) {
         this.outputFunc = outputFunc;
         this.config = config;
         this.service = service;
+        this.renderer = renderer;
         this.excludedDirs = excludedDirs;
     }
     async create(options) {
@@ -66,46 +67,46 @@ export class PeopleDirectoryStepFactory {
         for (const peopleLetterFile of peopleLetterFiles) {
             const c = peopleLetterFile.charAt(peopleLetterFile.length - 1);
             const peopleDir = `people/${c}/`;
-            const peopleDirectoryStep = new PeopleDirectoryStep(`directory of people with name starting with "${c}"`, [peopleDir], [], path.join(peopleDir, "index.html"), this.outputFunc, this.config, this.service, (p) => p.dirName.startsWith(peopleDir));
+            const peopleDirectoryStep = new PeopleDirectoryStep(`directory of people with name starting with "${c}"`, [peopleDir], [], path.join(peopleDir, "index.html"), this.outputFunc, this.config, this.service, this.renderer, (p) => p.dirName.startsWith(peopleDir));
             letterDirectorySteps.push(peopleDirectoryStep);
         }
         return letterDirectorySteps;
     }
     createAll(dirs, templateFileName) {
-        return new PeopleDirectoryStep("all people directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service);
+        return new PeopleDirectoryStep("all people directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer);
     }
     createMilitary(dirs, templateFileName) {
-        return new PeopleDirectoryStep("military people directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.military]));
+        return new PeopleDirectoryStep("military people directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.military]));
     }
     createPoliticians(dirs, templateFileName, rulersTemplateFileName) {
         const steps = [
-            new PeopleDirectoryStep("politicians directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.politician]))
+            new PeopleDirectoryStep("politicians directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.politician]))
         ];
         if (rulersTemplateFileName) {
-            steps.push(new PeopleDirectoryStep("politician leaders directories", dirs, this.excludedDirs, rulersTemplateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.leader])));
+            steps.push(new PeopleDirectoryStep("politician leaders directories", dirs, this.excludedDirs, rulersTemplateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.leader])));
         }
         return steps;
     }
     createSoftwareEngineers(dirs, templateFileName) {
-        return new PeopleDirectoryStep("software engineers directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.softwareEngineer]));
+        return new PeopleDirectoryStep("software engineers directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.softwareEngineer]));
     }
     createPilots(dirs, templateFileName) {
-        return new PeopleDirectoryStep("pilots directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.astronaut, Occupation.pilot]));
+        return new PeopleDirectoryStep("pilots directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.astronaut, Occupation.pilot]));
     }
     createContactees(dirs, templateFileName) {
-        return new PeopleDirectoryStep("contactees directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.contactee]));
+        return new PeopleDirectoryStep("contactees directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.contactee]));
     }
     createAstronomers(dirs, templateFileName) {
-        return new PeopleDirectoryStep("astronomers directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.astronomer]));
+        return new PeopleDirectoryStep("astronomers directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.astronomer]));
     }
     createUfoWitnesses(dirs, templateFileName) {
-        return new PeopleDirectoryStep(`UFO witnesses directories`, dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.ufoWitness, Occupation.ufoWitness2, Occupation.abductee, Occupation.contactee]));
+        return new PeopleDirectoryStep(`UFO witnesses directories`, dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.ufoWitness, Occupation.ufoWitness2, Occupation.abductee, Occupation.contactee]));
     }
     createUfologists(dirs, templateFileName) {
-        return new PeopleDirectoryStep("ufologists directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.ufologist]));
+        return new PeopleDirectoryStep("ufologists directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([Occupation.ufologist]));
     }
     createScientists(dirs, templateFileName) {
-        return new PeopleDirectoryStep("scientists directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([
+        return new PeopleDirectoryStep("scientists directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, this.renderer, peopleOccupationFilter([
             Occupation.anthropologist, Occupation.astronomer, Occupation.astrophysicist, Occupation.archeologist,
             Occupation.biochemist, Occupation.biologist, Occupation.biophysicist, Occupation.botanist,
             Occupation.chemist,

package/dist/people/PeopleFactory.d.ts

@@ -3,11 +3,11 @@ import { RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { PeopleJson } from "./PeopleJson";
 export declare class PeopleFactory extends TypedDataFactory<People, PeopleJson> {
     constructor(eventFactory: RR0EventFactory);
+    parse(peopleJson: PeopleJson): People;
     /**
      * Determine people name from directory name.
      *
-     * @param dirName
+     * @param peopleJson
      */
-    createFromDirName(dirName: string): People;
-    parse(peopleJson: PeopleJson): People;
+    protected completeFromDirName(peopleJson: PeopleJson): PeopleJson;
 }

package/dist/people/PeopleFactory.js

@@ -1,31 +1,16 @@
 import { People } from "./People.js";
-import path from "path";
-import { StringUtil } from "../util/index.js";
 import { TypedDataFactory } from "@rr0/data";
+import { StringUtil } from "../util";
+import path from "path";
 export class PeopleFactory extends TypedDataFactory {
     constructor(eventFactory) {
         super(eventFactory, "people");
     }
-    /**
-     * Determine people name from directory name.
-     *
-     * @param dirName
-     */
-    createFromDirName(dirName) {
-        const lastSlash = dirName.lastIndexOf("/");
-        const lastDir = dirName.substring(lastSlash + 1);
-        const title = StringUtil.camelToText(lastDir);
-        const firstSpace = title.indexOf(" ");
-        const lastName = title.substring(0, firstSpace);
-        const firstNameStr = title.substring(firstSpace + 1);
-        const firstNames = firstNameStr.split(" ");
-        const id = path.basename(dirName);
-        return new People(firstNames, lastName, undefined, undefined, undefined, false, undefined, undefined, undefined, id, dirName);
-    }
     parse(peopleJson) {
-        const people = this.createFromDirName(peopleJson.dirName);
+        peopleJson = this.completeFromDirName(peopleJson);
+        const peopleData = super.parse(peopleJson);
+        const people = new People(peopleData.firstNames, peopleData.lastName, peopleData.occupations, peopleData.occupations, peopleData.countries, peopleData.discredited, peopleData.birthTime, peopleData.deathTime, peopleData.gender, peopleData.id, peopleData.dirName, peopleData.image, peopleData.url, peopleData.events);
         peopleJson.name = people.name;
-        Object.assign(people, super.parse(peopleJson));
         let title = peopleJson.title;
         let qualifier;
         if (title) {
@@ -49,7 +34,33 @@ export class PeopleFactory extends TypedDataFactory {
             }
         }
         people.title = people.firstAndLastName + (qualifier ? ` (${qualifier})` : "");
-        Object.assign(people, { events: peopleJson.events.map(this.eventFactory.parse) });
         return people;
     }
+    /**
+     * Determine people name from directory name.
+     *
+     * @param peopleJson
+     */
+    completeFromDirName(peopleJson) {
+        const result = { ...peopleJson };
+        const dirName = peopleJson.dirName;
+        if (dirName) {
+            const lastSlash = dirName.lastIndexOf("/");
+            const lastDir = dirName.substring(lastSlash + 1);
+            const title = StringUtil.camelToText(lastDir);
+            const firstSpace = title.indexOf(" ");
+            const lastName = title.substring(0, firstSpace);
+            result.lastName = peopleJson.lastName || lastName;
+            const firstNameStr = title.substring(firstSpace + 1);
+            const firstNames = firstNameStr.split(" ");
+            result.firstNames = peopleJson.firstNames || firstNames;
+            const id = path.basename(dirName);
+            result.id = peopleJson.id || id;
+            result.title = `${firstNames.join(" ")} ${lastName}`;
+        }
+        else {
+            result.dirName = "";
+        }
+        return result;
+    }
 }

package/dist/people/PeopleFactory.test.js

@@ -1,81 +1,29 @@
-import { PeopleService } from "./PeopleService.js";
-import { People } from "./People.js";
 import { describe, expect, test } from "@javarome/testscript";
-import { rr0TestUtil } from "../test/index.js";
-import path from "path";
+import { PeopleFactory } from "./PeopleFactory";
+import { RR0EventFactory } from "@rr0/data";
+import { People } from "./People";
+import { Occupation } from "./Occupation";
+import { CountryCode } from "../org";
 describe("PeopleFactory", () => {
-    const dataService = rr0TestUtil.dataService;
-    const peopleRoot = "src/people";
-    const peopleFiles = [
-        path.join(peopleRoot, "a/Aristote"),
-        path.join(peopleRoot, "b/BeauJerome"),
-        path.join(peopleRoot, "b/BeauJeromePierre"),
-        path.join(peopleRoot, "c/CondonEdwardU"),
-        path.join(peopleRoot, "h/HynekJosefAllen"),
-        path.join(peopleRoot, "v/VonBraunWerner")
-    ];
-    const factory = new PeopleService(dataService, rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
-    test("build people with one first name", () => {
-        expect(factory.createFromFullName("Jérôme Beau")).toEqual(new People(["Jérôme"], "Beau", [], [], [], false, undefined, undefined, undefined, "people/b/BeauJerome"));
-    });
+    const eventFactory = new RR0EventFactory();
+    const factory = new PeopleFactory(eventFactory);
     test("build people with two first names", () => {
-        const people = factory.createFromFullName("Jérôme Pierre Beau");
-        expect(people.title).toBe("Beau, Jérôme Pierre");
-        expect(people.countries).toBe([]);
-        expect(people.lastName).toBe("Beau");
-        expect(people.firstNames).toBe(["Jérôme", "Pierre"]);
-        expect(people.hoax).toBe(false);
-        expect(people.discredited).toBe(false);
-        expect(people.dirName).toBe("people/b/BeauJeromePierre");
-        expect(people.occupations).toBe([]);
-        expect(people.pseudonyms).toBe([]);
-    });
-    test("build people with two last names", () => {
-        const people = factory.createFromFullName("Werner VonBraun");
-        expect(people.title).toBe("Von Braun, Werner");
-        expect(people.countries).toBe([]);
-        expect(people.lastName).toBe("VonBraun");
-        expect(people.firstNames).toBe(["Werner"]);
-        expect(people.hoax).toBe(false);
-        expect(people.discredited).toBe(false);
-        expect(people.dirName).toBe("people/v/VonBraunWerner");
-        expect(people.occupations).toBe([]);
-        expect(people.pseudonyms).toBe([]);
-    });
-    test("build people with one initial first names", () => {
-        const people = factory.createFromFullName("Edward U. Condon");
-        expect(people.title).toBe("Condon, Edward U.");
-        expect(people.countries).toBe([]);
-        expect(people.lastName).toBe("Condon");
-        expect(people.firstNames).toBe(["Edward", "U."]);
-        expect(people.hoax).toBe(false);
-        expect(people.discredited).toBe(false);
-        expect(people.dirName).toBe("people/c/CondonEdwardU");
-        expect(people.occupations).toBe([]);
-        expect(people.pseudonyms).toBe([]);
-    });
-    test("build people with last name first", () => {
-        const people = factory.createFromFullName("Hynek, Josef Allen");
-        expect(people.title).toBe("Hynek, Josef Allen");
-        expect(people.countries).toBe([]);
-        expect(people.lastName).toBe("Hynek");
-        expect(people.firstNames).toBe(["Josef", "Allen"]);
-        expect(people.hoax).toBe(false);
-        expect(people.discredited).toBe(false);
-        expect(people.dirName).toBe("people/h/HynekJosefAllen");
-        expect(people.occupations).toBe([]);
-        expect(people.pseudonyms).toBe([]);
-    });
-    test("Single name", () => {
-        const people = factory.createFromFullName("Aristote");
-        expect(people.title).toBe("Aristote");
-        expect(people.countries).toBe([]);
-        expect(people.lastName).toBe("Aristote");
-        expect(people.firstNames).toBe([]);
-        expect(people.hoax).toBe(false);
-        expect(people.discredited).toBe(false);
-        expect(people.dirName).toBe("people/a/Aristote");
-        expect(people.occupations).toBe([]);
-        expect(people.pseudonyms).toBe([]);
+        const villaJson = {
+            "birthTime": "1916-09-24",
+            "deathTime": "1980-11-22",
+            "occupations": [
+                "contactee",
+                "mechanic"
+            ],
+            "countries": [
+                "us"
+            ],
+            "pseudonyms": [
+                "Paul Villa"
+            ]
+        };
+        const parsed = factory.parse(villaJson);
+        const expected = new People(undefined, undefined, ["Paul Villa"], [Occupation.contactee, Occupation.mechanic], [CountryCode.us], true);
+        expect(parsed).toEqual(expected);
     });
 });

package/dist/people/PeopleHtmlRenderer.d.ts

@@ -0,0 +1,9 @@
+import { People } from "./People.js";
+import { HtmlRR0Context } from "../RR0Context.js";
+import { CountryCode } from "../org/index.js";
+import { Occupation } from "./Occupation.js";
+export declare class PeopleHtmlRenderer {
+    protected defaultPreviewFileNames: string[];
+    constructor(defaultPreviewFileNames?: string[]);
+    renderLink(context: HtmlRR0Context, people: People, pseudoPeopleList: People[], allCountries: Set<CountryCode>, occupations: Set<Occupation>, filterOccupations?: Occupation[], content?: string): HTMLElement;
+}

package/dist/people/PeopleHtmlRenderer.js

@@ -0,0 +1,93 @@
+import path from "path";
+import { Gender } from "@rr0/common";
+export class PeopleHtmlRenderer {
+    constructor(defaultPreviewFileNames = ["portrait.jpg", "portrait.gif", "portrait.png", "portrait.webp"]) {
+        this.defaultPreviewFileNames = defaultPreviewFileNames;
+    }
+    renderLink(context, people, pseudoPeopleList, allCountries, occupations, filterOccupations = [], content) {
+        var _a, _b, _c;
+        const dirName = people.dirName;
+        const events = people.events;
+        const titles = [];
+        const classList = ["data-resolved", "people-resolved"];
+        if (pseudoPeopleList.indexOf(people) >= 0 || people.pseudonyms.includes(content)) {
+            classList.push("pseudonym");
+            titles.push(`(pseudonyme de ${people.firstAndLastName})`);
+        }
+        if (people.hoax) {
+            classList.push("canular");
+        }
+        const birthTimeStr = (_a = people.birthTime) === null || _a === void 0 ? void 0 : _a.year.toString();
+        const deathTimeStr = (_b = people.deathTime) === null || _b === void 0 ? void 0 : _b.year.toString();
+        if (people.isDeceased()) {
+            classList.push("deceased");
+        }
+        if (birthTimeStr || deathTimeStr) {
+            const timeStr = birthTimeStr ? deathTimeStr ? `${birthTimeStr}-${deathTimeStr}` : `${birthTimeStr}-` : `-${deathTimeStr}`;
+            titles.push(timeStr);
+        }
+        const age = people.getAge();
+        if (age) {
+            titles.push(`${age} ans`);
+        }
+        const countries = people.countries;
+        if (countries) {
+            for (const country of countries) {
+                allCountries.add(country);
+                const countryLabel = (_c = context.messages.country[country]) === null || _c === void 0 ? void 0 : _c.title;
+                if (!countryLabel) {
+                    throw new Error(`No title for country "${country}"`);
+                }
+                titles.push(countryLabel);
+                classList.push(`country-${country}`);
+            }
+        }
+        const gender = people.gender || Gender.male;
+        for (const occupation of people.occupations) {
+            if (filterOccupations.length > 1 || !filterOccupations.includes(occupation)) {
+                occupations.add(occupation);
+                const occupationMsg = context.messages.people.occupation[occupation];
+                if (!occupationMsg) {
+                    throw Error(`No message to translate occupation "${occupation}" in ${context.locale}, as specified in ${people.dirName}/people*.json`);
+                }
+                classList.push(`occupation-${occupation}`);
+                titles.push(occupationMsg(gender));
+            }
+        }
+        const text = content || people.lastAndFirstName;
+        const doc = context.file.document;
+        const link = doc.createElement("a");
+        link.innerHTML = text;
+        link.href = `/${dirName}/`;
+        if (people.discredited) {
+            link.append(" 🤥");
+            titles.push("discrédité");
+        }
+        const elem = doc.createElement("span");
+        if (titles.length > 0) {
+            elem.title = titles.join(", ");
+        }
+        if (classList.length > 0) {
+            elem.classList.add(...classList);
+        }
+        let portraitUrl = people.image;
+        const imageEvents = events.filter(event => event.eventType === "image");
+        if (!portraitUrl) {
+            const portraitEvent = imageEvents.find(event => this.defaultPreviewFileNames.includes(event.url));
+            if (portraitEvent) {
+                portraitUrl = path.join("/", people.dirName, portraitEvent.url);
+            }
+        }
+        if (portraitUrl) {
+            const portraitElem = doc.createElement("img");
+            portraitElem.src = path.join("/", portraitUrl);
+            portraitElem.alt = people.lastAndFirstName;
+            portraitElem.className = "portrait";
+            portraitElem.loading = "lazy";
+            portraitElem.width = 75;
+            link.append(portraitElem);
+        }
+        elem.append(link);
+        return elem;
+    }
+}

package/dist/people/PeopleJson.d.ts

@@ -1,39 +1,34 @@
-import { Occupation } from "./Occupation.js";
-import { Gender } from "@rr0/common";
-import { CountryCode } from "../org/country/CountryCode.js";
-import { Level2Date as EdtfDate } from "@rr0/time";
 import { RR0DataJson } from "@rr0/data/dist/RR0DataJson";
 import { RR0EventJson } from "@rr0/data/dist/event/RR0EventJson";
-export declare class PeopleJson implements RR0DataJson {
-    readonly type = "people";
-    title: string;
-    name: string;
+export type PeopleJson = RR0DataJson & {
+    type?: "people";
+    title?: string;
+    name?: string;
     /**
      * The people actually doesn't exist.
      */
-    hoax: boolean;
-    lastAndFirstName: string;
-    firstNames: string[];
-    lastName: string;
-    pseudonyms: string[];
-    occupations: Occupation[];
-    countries: CountryCode[];
+    hoax?: boolean;
+    firstNames?: string[];
+    lastName?: string;
+    pseudonyms?: string[];
+    occupations?: string[];
+    countries?: string[];
     /**
      * The people has been caught lying or has confessed a hoax.
      */
-    discredited: boolean;
+    discredited?: boolean;
     /**
      * @deprecated Use a "birth"-typed event instead.
      */
-    birthTime?: EdtfDate;
+    birthTime?: string;
     /**
      * @deprecated Use a "death"-typed event instead.
      */
-    deathTime?: EdtfDate;
-    gender?: Gender;
-    id: string;
+    deathTime?: string;
+    gender?: "male" | "female";
+    id?: string;
     dirName?: string;
     image?: string;
     url?: string;
-    events: RR0EventJson[];
-}
+    events?: RR0EventJson[];
+};

package/dist/people/PeopleJson.js

@@ -1,19 +1 @@
-export class PeopleJson {
-    constructor() {
-        this.type = "people";
-        /**
-         * The people actually doesn't exist.
-         */
-        this.hoax = false;
-        this.firstNames = [];
-        this.lastName = "";
-        this.pseudonyms = [];
-        this.occupations = [];
-        this.countries = [];
-        /**
-         * The people has been caught lying or has confessed a hoax.
-         */
-        this.discredited = false;
-        this.events = [];
-    }
-}
+export {};

package/dist/people/PeopleRegexReplaceCommand.test.js

@@ -4,12 +4,14 @@ import { ClassDomReplaceCommand } from "ssg-api";
 import { describe, expect, test } from "@javarome/testscript";
 import { PeopleService } from "./PeopleService.js";
 import path from "path";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 describe("ClassDomReplaceCommand", () => {
     test("replaces", async () => {
         const peopleRoot = "src/people";
         const peopleFiles = [path.join(peopleRoot, "b/BeauJerome")];
+        const peopleRenderer = new PeopleHtmlRenderer();
         const peopleService = new PeopleService(rr0TestUtil.dataService, rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
-        const command = new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService), "people");
+        const command = new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService, peopleRenderer), "people");
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", `<span class="people">Jérôme Beau</span>`);
         await command.execute(context);
         expect(context.file.contents).toBe(`<html><head></head><body><span title="1972-, 50 ans, France, ufologue, Informaticien" class="country-fr occupation-ufologist occupation-softwareEngineer" translate="no"><a href="/src/people/b/BeauJerome/">Jérôme Beau</a></span></body></html>`);

package/dist/people/PeopleReplacer.d.ts

@@ -1,8 +1,10 @@
 import { PeopleService } from "./PeopleService.js";
 import { DomReplacement } from "../time/DomReplacement.js";
 import { HtmlRR0Context } from "../RR0Context.js";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 export declare class PeopleReplacer implements DomReplacement<HtmlRR0Context> {
     protected service: PeopleService;
-    constructor(service: PeopleService);
+    protected renderer: PeopleHtmlRenderer;
+    constructor(service: PeopleService, renderer: PeopleHtmlRenderer);
     replacement(context: HtmlRR0Context, element: HTMLElement): Promise<HTMLElement>;
 }

package/dist/people/PeopleReplacer.js

@@ -1,6 +1,7 @@
 export class PeopleReplacer {
-    constructor(service) {
+    constructor(service, renderer) {
         this.service = service;
+        this.renderer = renderer;
     }
     async replacement(context, element) {
         const title = element.title;
@@ -29,7 +30,7 @@ export class PeopleReplacer {
             const allCountries = new Set();
             const occupations = new Set;
             const peopl = peopleList[0] || people;
-            replacement = this.service.getLink(context, peopl, pseudoPeopleList, allCountries, occupations, [], peopleContent);
+            replacement = this.renderer.renderLink(context, peopl, pseudoPeopleList, allCountries, occupations, [], peopleContent);
         }
         else {
             const span = context.file.document.createElement("span");

package/dist/people/PeopleReplacer.test.js

@@ -5,6 +5,7 @@ import { describe, expect, test } from "@javarome/testscript";
 import { PeopleFactory } from "./PeopleFactory.js";
 import path from "path";
 import { AllDataService, RR0EventFactory } from "@rr0/data";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 describe("PeopleReplacer", () => {
     const peopleRoot = "src/people";
     const peopleFiles = [
@@ -22,7 +23,9 @@ describe("PeopleReplacer", () => {
     }
     test("ignore brackets", async () => {
         const dataService = new AllDataService([peopleFactory]);
-        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService()));
+        const peopleService = new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService());
+        const peopleRenderer = new PeopleHtmlRenderer();
+        const replacer = new PeopleReplacer(peopleService, peopleRenderer);
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
         {
             const lastnameFirstElement = createPeopleElement(context, "Hynek, Josef Allen (Northwestern University, Evanston, Illinois)");
@@ -37,7 +40,9 @@ describe("PeopleReplacer", () => {
     });
     test("replace people tags", async () => {
         const dataService = new AllDataService([peopleFactory]);
-        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService()));
+        const peopleService = new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService());
+        const peopleRenderer = new PeopleHtmlRenderer();
+        const replacer = new PeopleReplacer(peopleService, peopleRenderer);
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
         {
             const peopleWithTitle = createPeopleElement(context, "Ronald Reagan", "Ronald Wilson Reagan");

package/dist/people/PeopleReplacerFactory.d.ts

@@ -2,13 +2,15 @@ import { PeopleReplacer } from "./PeopleReplacer.js";
 import { DomReplacer, ReplacerFactory } from "ssg-api";
 import { PeopleService } from "./PeopleService.js";
 import { HtmlRR0Context } from "../RR0Context.js";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 /**
  * Creates replacers for people HTML in a given context.
  */
 export declare class PeopleReplacerFactory implements ReplacerFactory<DomReplacer> {
     protected service: PeopleService;
+    protected renderer: PeopleHtmlRenderer;
     protected singleton?: PeopleReplacer;
-    constructor(service: PeopleService);
+    constructor(service: PeopleService, renderer: PeopleHtmlRenderer);
     create(context: HtmlRR0Context): Promise<DomReplacer>;
     protected getInstance(): Promise<PeopleReplacer>;
 }

package/dist/people/PeopleReplacerFactory.js

@@ -3,8 +3,9 @@ import { PeopleReplacer } from "./PeopleReplacer.js";
  * Creates replacers for people HTML in a given context.
  */
 export class PeopleReplacerFactory {
-    constructor(service) {
+    constructor(service, renderer) {
         this.service = service;
+        this.renderer = renderer;
     }
     async create(context) {
         const instance = await this.getInstance();
@@ -16,7 +17,7 @@ export class PeopleReplacerFactory {
     }
     async getInstance() {
         if (!this.singleton) {
-            this.singleton = new PeopleReplacer(this.service);
+            this.singleton = new PeopleReplacer(this.service, this.renderer);
         }
         return this.singleton;
     }

package/dist/people/PeopleService.d.ts

@@ -1,7 +1,4 @@
 import { People } from "./People.js";
-import { HtmlRR0Context } from "../RR0Context.js";
-import { CountryCode } from "../org/index.js";
-import { Occupation } from "./Occupation.js";
 import { PeopleFactory } from "./PeopleFactory.js";
 import { AbstractDataService, AllDataService } from "@rr0/data";
 import { TimeService } from "../time";
@@ -15,5 +12,4 @@ export declare class PeopleService extends AbstractDataService<People, PeopleJso
     getAll(): Promise<People[]>;
     getFromDirs(dirNames: string[]): Promise<People[]>;
     getFromDir(dirName: string): Promise<People[]>;
-    getLink(context: HtmlRR0Context, people: People, pseudoPeopleList: People[], allCountries: Set<CountryCode>, occupations: Set<Occupation>, filterOccupations?: Occupation[], content?: string): HTMLElement;
 }

package/dist/people/PeopleService.js

@@ -1,7 +1,5 @@
 import { People } from "./People.js";
-import path from "path";
-import { Gender } from "@rr0/common";
-import { AbstractDataFactory, AbstractDataService } from "@rr0/data";
+import { AbstractDataService } from "@rr0/data";
 export class PeopleService extends AbstractDataService {
     constructor(dataService, peopleFactory, files, timeService) {
         super(dataService, peopleFactory, files);
@@ -34,13 +32,7 @@ export class PeopleService extends AbstractDataService {
         if (this.files.indexOf(dirName) < 0) {
             dirName = undefined;
         }
-        let created;
-        if (dirName && !lastName && (firstNames === null || firstNames === void 0 ? void 0 : firstNames.length) <= 0) {
-            created = this.peopleFactory.createFromDirName(dirName);
-        }
-        else {
-            created = new People(firstNames, lastName, undefined, undefined, undefined, false, undefined, undefined, undefined, undefined, dirName);
-        }
+        const created = this.peopleFactory.parse({ firstNames, lastName, dirName });
         this.cache.set(lastName, created);
         return created;
     }
@@ -59,90 +51,4 @@ export class PeopleService extends AbstractDataService {
         const fileSpec = ["people*.json"];
         return this.dataService.getFromDir(dirName, ["people", undefined], fileSpec);
     }
-    getLink(context, people, pseudoPeopleList, allCountries, occupations, filterOccupations = [], content) {
-        var _a, _b, _c;
-        const dirName = people.dirName;
-        const events = people.events;
-        const titles = [];
-        const classList = ["data-resolved", "people-resolved"];
-        if (pseudoPeopleList.indexOf(people) >= 0 || people.pseudonyms.includes(content)) {
-            classList.push("pseudonym");
-            titles.push(`(pseudonyme de ${people.firstAndLastName})`);
-        }
-        if (people.hoax) {
-            classList.push("canular");
-        }
-        const birthTimeStr = (_a = people.birthTime) === null || _a === void 0 ? void 0 : _a.year.toString();
-        const deathTimeStr = (_b = people.deathTime) === null || _b === void 0 ? void 0 : _b.year.toString();
-        if (people.isDeceased()) {
-            classList.push("deceased");
-        }
-        if (birthTimeStr || deathTimeStr) {
-            const timeStr = birthTimeStr ? deathTimeStr ? `${birthTimeStr}-${deathTimeStr}` : `${birthTimeStr}-` : `-${deathTimeStr}`;
-            titles.push(timeStr);
-        }
-        const age = people.getAge();
-        if (age) {
-            titles.push(`${age} ans`);
-        }
-        const countries = people.countries;
-        if (countries) {
-            for (const country of countries) {
-                allCountries.add(country);
-                const countryLabel = (_c = context.messages.country[country]) === null || _c === void 0 ? void 0 : _c.title;
-                if (!countryLabel) {
-                    throw new Error(`No title for country "${country}"`);
-                }
-                titles.push(countryLabel);
-                classList.push(`country-${country}`);
-            }
-        }
-        const gender = people.gender || Gender.male;
-        for (const occupation of people.occupations) {
-            if (filterOccupations.length > 1 || !filterOccupations.includes(occupation)) {
-                occupations.add(occupation);
-                const occupationMsg = context.messages.people.occupation[occupation];
-                if (!occupationMsg) {
-                    throw Error(`No message to translate occupation "${occupation}" in ${context.locale}, as specified in ${people.dirName}/people*.json`);
-                }
-                classList.push(`occupation-${occupation}`);
-                titles.push(occupationMsg(gender));
-            }
-        }
-        const text = content || people.lastAndFirstName;
-        const doc = context.file.document;
-        const link = doc.createElement("a");
-        link.innerHTML = text;
-        link.href = `/${dirName}/`;
-        if (people.discredited) {
-            link.append(" 🤥");
-            titles.push("discrédité");
-        }
-        const elem = doc.createElement("span");
-        if (titles.length > 0) {
-            elem.title = titles.join(", ");
-        }
-        if (classList.length > 0) {
-            elem.classList.add(...classList);
-        }
-        let portraitUrl = people.image;
-        const imageEvents = events.filter(event => event.eventType === "image");
-        if (!portraitUrl) {
-            const portraitEvent = imageEvents.find(event => AbstractDataFactory.defaultImageFileNames.includes(event.url));
-            if (portraitEvent) {
-                portraitUrl = path.join("/", people.dirName, portraitEvent.url);
-            }
-        }
-        if (portraitUrl) {
-            const portraitElem = doc.createElement("img");
-            portraitElem.src = path.join("/", portraitUrl);
-            portraitElem.alt = people.lastAndFirstName;
-            portraitElem.className = "portrait";
-            portraitElem.loading = "lazy";
-            portraitElem.width = 75;
-            link.append(portraitElem);
-        }
-        elem.append(link);
-        return elem;
-    }
 }

package/dist/people/PeopleService.test.d.ts

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

package/dist/people/PeopleService.test.js

@@ -0,0 +1,82 @@
+import { PeopleService } from "./PeopleService.js";
+import { People } from "./People.js";
+import { describe, expect, test } from "@javarome/testscript";
+import { rr0TestUtil } from "../test/index.js";
+import path from "path";
+describe("PeopleService", () => {
+    const dataService = rr0TestUtil.dataService;
+    const peopleRoot = "test/people";
+    const peopleFiles = [
+        path.join(peopleRoot, "a/Aristote"),
+        path.join(peopleRoot, "b/BeauJerome"),
+        path.join(peopleRoot, "b/BeauJeromePierre"),
+        path.join(peopleRoot, "c/CondonEdwardU"),
+        path.join(peopleRoot, "h/HynekJosefAllen"),
+        path.join(peopleRoot, "v/VonBraunWerner"),
+        path.join("test/science/crypto/ufo/enquete/dossier", "Villa")
+    ];
+    const service = new PeopleService(dataService, rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
+    test("build people with one first name", () => {
+        expect(service.createFromFullName("Jérôme Beau")).toEqual(new People(["Jérôme"], "Beau", [], [], [], false, undefined, undefined, undefined, "people/b/BeauJerome"));
+    });
+    test("build people with two first names", () => {
+        const people = service.createFromFullName("Jérôme Pierre Beau");
+        expect(people.title).toBe("Beau, Jérôme Pierre");
+        expect(people.countries).toBe([]);
+        expect(people.lastName).toBe("Beau");
+        expect(people.firstNames).toBe(["Jérôme", "Pierre"]);
+        expect(people.hoax).toBe(false);
+        expect(people.discredited).toBe(false);
+        expect(people.dirName).toBe("people/b/BeauJeromePierre");
+        expect(people.occupations).toBe([]);
+        expect(people.pseudonyms).toBe([]);
+    });
+    test("build people with two last names", () => {
+        const people = service.createFromFullName("Werner VonBraun");
+        expect(people.title).toBe("Von Braun, Werner");
+        expect(people.countries).toBe([]);
+        expect(people.lastName).toBe("VonBraun");
+        expect(people.firstNames).toBe(["Werner"]);
+        expect(people.hoax).toBe(false);
+        expect(people.discredited).toBe(false);
+        expect(people.dirName).toBe("people/v/VonBraunWerner");
+        expect(people.occupations).toBe([]);
+        expect(people.pseudonyms).toBe([]);
+    });
+    test("build people with one initial first names", () => {
+        const people = service.createFromFullName("Edward U. Condon");
+        expect(people.title).toBe("Condon, Edward U.");
+        expect(people.countries).toBe([]);
+        expect(people.lastName).toBe("Condon");
+        expect(people.firstNames).toBe(["Edward", "U."]);
+        expect(people.hoax).toBe(false);
+        expect(people.discredited).toBe(false);
+        expect(people.dirName).toBe("people/c/CondonEdwardU");
+        expect(people.occupations).toBe([]);
+        expect(people.pseudonyms).toBe([]);
+    });
+    test("build people with last name first", () => {
+        const people = service.createFromFullName("Hynek, Josef Allen");
+        expect(people.title).toBe("Hynek, Josef Allen");
+        expect(people.countries).toBe([]);
+        expect(people.lastName).toBe("Hynek");
+        expect(people.firstNames).toBe(["Josef", "Allen"]);
+        expect(people.hoax).toBe(false);
+        expect(people.discredited).toBe(false);
+        expect(people.dirName).toBe("people/h/HynekJosefAllen");
+        expect(people.occupations).toBe([]);
+        expect(people.pseudonyms).toBe([]);
+    });
+    test("Single name", () => {
+        const people = service.createFromFullName("Aristote");
+        expect(people.title).toBe("Aristote");
+        expect(people.countries).toBe([]);
+        expect(people.lastName).toBe("Aristote");
+        expect(people.firstNames).toBe([]);
+        expect(people.hoax).toBe(false);
+        expect(people.discredited).toBe(false);
+        expect(people.dirName).toBe("people/a/Aristote");
+        expect(people.occupations).toBe([]);
+        expect(people.pseudonyms).toBe([]);
+    });
+});

package/dist/place/PlaceRenderer.js

@@ -1,4 +1,5 @@
 import { OrganizationPlace } from "./OrganizationPlace";
+import { NamedPlace } from "@rr0/place";
 /**
  * Convert a place to a <span class="place"> tag with the place name (or location)
  */
@@ -9,6 +10,9 @@ export class PlaceRenderer {
             const orgPlace = place;
             placeName = orgPlace.org.getTitle(context, { parent: true });
         }
+        else if (place instanceof NamedPlace) {
+            placeName = place.name;
+        }
         else {
             placeName = place.locations.map(location => location.toDMS(context.place)).join(",");
         }

package/dist/search/SearchComponent.d.mts

@@ -4,7 +4,13 @@ export class SearchComponent extends HTMLElement {
      * @type {string}
      */
     static readonly NAME: string;
+    static get observedAttributes(): string[];
     shadow: ShadowRoot;
+    /**
+     * @param {string} value
+     */
+    set placeholder(value: string);
+    attributeChangedCallback(name: any, oldValue: any, newValue: any): void;
     connectedCallback(): void;
     #private;
 }

package/dist/search/SearchComponent.mjs

@@ -46,11 +46,27 @@ export class SearchComponent extends HTMLElement {
         this.shadow = this.attachShadow({ mode: "closed" });
         this.shadow.appendChild(template.content.cloneNode(true));
     }
+    static get observedAttributes() {
+        return ["placeholder"];
+    }
+    /**
+     * @param {string} value
+     */
+    set placeholder(value) {
+        const input = this.shadow.getElementById("search-input");
+        input.placeholder = value;
+    }
+    attributeChangedCallback(name, oldValue, newValue) {
+        switch (name) {
+            case "placeholder":
+                this.placeholder = newValue;
+        }
+    }
     connectedCallback() {
         this.onmouseover = __classPrivateFieldGet(this, _SearchComponent_instances, "m", _SearchComponent_siteSearchLoad).bind(this);
         const input = this.shadow.getElementById("search-input");
         input.oninput = __classPrivateFieldGet(this, _SearchComponent_instances, "m", _SearchComponent_siteSearchChange).bind(this);
-        input.placeholder = this.getAttribute("placeholder") || "Recherche";
+        this.placeholder = "Recherche";
     }
 }
 _SearchComponent_siteIndex = new WeakMap(), _SearchComponent_loading = new WeakMap(), _SearchComponent_maxResultCount = new WeakMap(), _SearchComponent_instances = new WeakSet(), _SearchComponent_siteSearchChange = function _SearchComponent_siteSearchChange(e) {

package/dist/search/SearchIndexStep.js

@@ -43,7 +43,9 @@ export class SearchIndexStep {
             context.warn("Could not find", this.fileName, "Will create it");
             existingIndex = newIndex;
         }
-        context.log("Saving search index of", existingIndex.pages.length, "pages at", this.fileName);
+        const indexSize = existingIndex.pages.length;
+        context.setVar("indexSize", indexSize);
+        context.log("Saving search index of", indexSize, "pages at", this.fileName);
         const indexJson = JSON.stringify(existingIndex);
         return writeFile(this.fileName, indexJson, "utf-8");
     }

package/dist/source/SourceFactory.js

@@ -29,6 +29,7 @@ export class SourceFactory {
      * @param href
      */
     async createInternal(context, href) {
+        var _a;
         if (path.dirname(href).startsWith("/")) {
             href = href.substring(1);
         }
@@ -65,7 +66,7 @@ export class SourceFactory {
         }
         const publication = source.publication;
         if (publication && !publication.time) {
-            publication.time = this.time.contextFromFileName(context, href).date;
+            publication.time = (_a = this.time.contextFromFileName(context, href)) === null || _a === void 0 ? void 0 : _a.date;
         }
         if (hash) {
             source.index = hash;

package/dist/time/datasource/ChronologyReplacer.d.ts

@@ -18,6 +18,6 @@ export declare class ChronologyReplacer implements DomReplacement<HtmlRR0Context
     constructor(mappings: RR0CaseMapping<any>[], renderer: CaseSummaryRenderer);
     replacement(context: HtmlRR0Context, element: HTMLUListElement): Promise<HTMLUListElement>;
     protected aggregate(context: HtmlRR0Context, element: HTMLUListElement): Promise<void>;
-    protected aggregateDatasource(mapping: RR0CaseMapping<any>, context: HtmlRR0Context, existingCases: RR0CaseSummary[], casesToAdd: RR0CaseSummary[]): Promise<void>;
+    protected aggregateDatasource(context: HtmlRR0Context, mapping: RR0CaseMapping<any>, existingCases: RR0CaseSummary[], casesToAdd: RR0CaseSummary[]): Promise<void>;
     protected merge(context: HtmlRR0Context, sourceCases: any[], fetchTime: Date, mapping: RR0CaseMapping<any>, existingCases: RR0CaseSummary[]): RR0CaseSummary[];
 }

package/dist/time/datasource/ChronologyReplacer.js

@@ -36,7 +36,7 @@ export class ChronologyReplacer {
             }
             const datasourceKey = context.file.name + "$" + datasource.copyright;
             if (!this.done.has(datasourceKey)) {
-                await this.aggregateDatasource(mapping, context, existingCases, casesToAdd);
+                await this.aggregateDatasource(context, mapping, existingCases, casesToAdd);
                 this.done.add(datasourceKey);
                 const merge = mapping.actions.write.includes("pages");
                 if (merge) {
@@ -51,10 +51,14 @@ export class ChronologyReplacer {
             }
         }
     }
-    async aggregateDatasource(mapping, context, existingCases, casesToAdd) {
+    async aggregateDatasource(context, mapping, existingCases, casesToAdd) {
         let fetched;
         const datasource = mapping.datasource;
         const backupDatasource = mapping.backupDatasource;
+        if (!backupDatasource) {
+            context.warn(`${mapping.constructor.name} has no backupDatasource`);
+            return;
+        }
         for (const readMethod of mapping.actions.read) {
             if (fetched) {
                 break;

package/dist/time/datasource/baseovnifrance/{BaseOvniFranceCaseSummaryMapper.d.ts → BaseOvniFranceCaseSummaryCsvMapper.d.ts}

@@ -5,7 +5,7 @@ import { BaseOvniFranceCase } from "./BaseOvniFranceCase.js";
 /**
  * Maps a Base OVNI France CSV case to a Base OVNI France case.
  */
-export declare class BaseOvniFranceCaseSummaryMapper implements CaseMapper<RR0Context, BaseOvniFranceCase, BaseOvniFranceCaseSummary> {
+export declare class BaseOvniFranceCaseSummaryCsvMapper implements CaseMapper<RR0Context, BaseOvniFranceCase, BaseOvniFranceCaseSummary> {
     readonly baseUrl: URL;
     readonly copyright: string;
     readonly authors: string[];

package/dist/time/datasource/baseovnifrance/{BaseOvniFranceCaseSummaryMapper.js → BaseOvniFranceCaseSummaryCsvMapper.js}

@@ -2,7 +2,7 @@ import { Level2Date as EdtfDate, Level2Timeshift } from "@rr0/time";
 /**
  * Maps a Base OVNI France CSV case to a Base OVNI France case.
  */
-export class BaseOvniFranceCaseSummaryMapper {
+export class BaseOvniFranceCaseSummaryCsvMapper {
     constructor(baseUrl, copyright, authors) {
         this.baseUrl = baseUrl;
         this.copyright = copyright;

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCsv.test.js

@@ -4,7 +4,7 @@ import { rr0TestUtil } from "../../../test/index.js";
 import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
 import fs from "fs";
 import { baseOvniFranceDatasource, baseOvniFranceSortComparator } from "./BaseOvniFranceRR0Mapping.js";
-import { BaseOvniFranceCaseSummaryMapper } from "./BaseOvniFranceCaseSummaryMapper.js";
+import { BaseOvniFranceCaseSummaryCsvMapper } from "./BaseOvniFranceCaseSummaryCsvMapper.js";
 describe("Base OVNI France CSV mapping", () => {
     const dataDate = new Date("2024-08-12 00:00:00 GMT+1");
     let context;
@@ -34,7 +34,7 @@ ${case1.id},http://baseovnifrance.free.fr/listgen.php?typlist=20&page=0&numobs=2
     test("read", () => {
         const fileMapper = new CsvMapper("&");
         const data = fs.readFileSync("time/1/9/7/7/03/05_03_24_1709676761.txt", { encoding: "latin1" });
-        const csvMapper = new BaseOvniFranceCaseSummaryMapper(baseOvniFranceDatasource.baseUrl, baseOvniFranceDatasource.searchPath, baseOvniFranceDatasource.authors);
+        const csvMapper = new BaseOvniFranceCaseSummaryCsvMapper(baseOvniFranceDatasource.baseUrl, baseOvniFranceDatasource.searchPath, baseOvniFranceDatasource.authors);
         const cases = fileMapper.parse(data)
             .map(csvCase => csvMapper.map(context, csvCase, dataDate))
             .sort(baseOvniFranceSortComparator);

package/dist/time/datasource/baseovnifrance/BaseOvniFranceHttpDatasource.js

@@ -64,7 +64,7 @@ export class BaseOvniFranceHttpDatasource extends BaseOvniFranceDatasource {
         const minutes = timeFields ? parseInt(timeFields[2], 10) : undefined;
         dateTime.hour = hour;
         dateTime.minute = minutes;
-        dateTime.timeshift = Level2Timeshift.fromString("GMT+1");
+        dateTime.timeshift = Level2Timeshift.fromString("+01"); // GMT+1/UTC+1
     }
     getFromRow(context, row) {
         const columns = row.querySelectorAll("td");

package/dist/time/datasource/baseovnifrance/index.d.ts

@@ -1,6 +1,6 @@
 export * from "./BaseOvniFranceCase.js";
 export * from "./BaseOvniFranceCaseSummary.js";
-export * from "./BaseOvniFranceCaseSummaryMapper.js";
+export * from "./BaseOvniFranceCaseSummaryCsvMapper.js";
 export * from "./BaseOvniFranceCaseSummaryRR0Mapper.js";
 export * from "./BaseOvniFranceDatasource.js";
 export * from "./BaseOvniFranceHttpDatasource.js";

package/dist/time/datasource/baseovnifrance/index.js

@@ -1,6 +1,6 @@
 export * from "./BaseOvniFranceCase.js";
 export * from "./BaseOvniFranceCaseSummary.js";
-export * from "./BaseOvniFranceCaseSummaryMapper.js";
+export * from "./BaseOvniFranceCaseSummaryCsvMapper.js";
 export * from "./BaseOvniFranceCaseSummaryRR0Mapper.js";
 export * from "./BaseOvniFranceDatasource.js";
 export * from "./BaseOvniFranceHttpDatasource.js";

package/dist/time/datasource/rr0/RR0Mapping.d.ts

@@ -10,7 +10,7 @@ export declare class RR0Mapping implements RR0CaseMapping<RR0CaseSummary> {
     static baseUrl: URL;
     static searchPath: string;
     readonly datasource: RR0Datasource;
-    readonly fileDatasource: RR0FileDatasource;
+    readonly backupDatasource: RR0FileDatasource;
     readonly mapper: RR0CaseSummaryMapper;
     constructor(cityService: CityService, actions: ChronologyReplacerActions);
 }

package/dist/time/datasource/rr0/RR0Mapping.js

@@ -6,7 +6,7 @@ export class RR0Mapping {
         this.actions = actions;
         const rr0HttpDatasource = this.datasource = new RR0HttpDatasource(RR0Mapping.baseUrl, RR0Mapping.searchPath, cityService);
         const csvMapper = this.mapper = new RR0CaseSummaryMapper(rr0HttpDatasource.baseUrl, rr0HttpDatasource.searchPath, rr0HttpDatasource.authors);
-        this.fileDatasource = new RR0FileDatasource(csvMapper);
+        this.backupDatasource = new RR0FileDatasource(csvMapper);
     }
 }
 RR0Mapping.baseUrl = new URL("https://rr0.org");

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.2.2",
+  "version": "0.2.4",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,7 +32,7 @@
     "@rr0/lang": "^0.1.12",
     "@rr0/time": "^0.9.1",
     "@rr0/place": "^0.5.1",
-    "@rr0/data": "^0.2.1",
+    "@rr0/data": "^0.2.3",
     "@javarome/fileutil": "^0.3.6",
     "ssg-api": "^1.16.12",
     "canvas": "^2.11.2",