@rr0/cms 0.1.16 → 0.1.17

package/dist/org/us/region/nv/clark/LasVegas/LasVegasMessages.js

@@ -0,0 +1,2 @@
+import { CityMessages } from "../../../../../country/index.js";
+export let lasVegasMessages = CityMessages.create("Las Vegas");

package/dist/people/People.d.ts

@@ -1,8 +1,7 @@
 import { Occupation } from "./Occupation.js";
 import { Gender } from "@rr0/common";
 import { CountryCode } from "../org/country/CountryCode.js";
-import { RR0Data } from "../data/RR0Data.js";
-import { RR0Event } from "../event/RR0Event.js";
+import { RR0Data, RR0Event } from "@rr0/data";
 export declare class People implements RR0Data {
     firstNames: string[];
     lastName: string;

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

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

package/dist/people/People.test.js

@@ -0,0 +1,34 @@
+import { People } from "./People.js";
+import { PeopleService } from "./PeopleService.js";
+import { describe, expect, test } from "@javarome/testscript";
+import { rr0TestUtil } from "../test/index.js";
+import path from "path";
+import { AllDataService } from "@rr0/data";
+describe("People", () => {
+    const peopleRoot = "src/people";
+    const peopleFiles = [
+        path.join(peopleRoot, "b/BeauJerome"),
+        path.join(peopleRoot, "b/BeauJeromePierre"),
+        path.join(peopleRoot, "h/HynekJosefAllen"),
+        path.join(peopleRoot, "v/VonBraunWerner")
+    ];
+    const service = new PeopleService(new AllDataService([]), rr0TestUtil.peopleFactory, peopleFiles);
+    test("age", async () => {
+        const [hynek] = await service.getFromDir("HynekJosefAllen");
+        expect(hynek.isDeceased()).toBe(false);
+        expect(hynek.getAge()).toBe(undefined);
+        hynek.birthTime = new Date("1910-05-01");
+        expect(hynek.isDeceased()).toBe(false);
+        expect(hynek.isDeceased(new Date("2040"))).toBe(true);
+        expect(hynek.getAge(new Date("1972-08-12"))).toBe(62);
+        hynek.deathTime = new Date("1986-04-27");
+        expect(hynek.isDeceased()).toBe(true);
+        expect(hynek.getAge(new Date("1986-04-27"))).toBe(76);
+        expect(hynek.getAge(new Date("2020-04-27"))).toBe(76);
+    });
+    test("build url", () => {
+        expect(People.getUrl("Beau", ["Jérôme"])).toBe("people/b/BeauJerome");
+        expect(People.getUrl("Beau", ["Jérôme", "Pierre"])).toBe("people/b/BeauJeromePierre");
+        expect(People.getUrl("VonBraun", ["Werner"])).toBe("people/v/VonBraunWerner");
+    });
+});

package/dist/people/PeopleDirectoryStep.d.ts

@@ -1,7 +1,7 @@
 import { Occupation } from "./Occupation.js";
 import { People } from "./People.js";
 import { HtmlRR0Context } from "../RR0Context.js";
-import { DirectoryStep, OutputFunc, SsgConfig } from "ssg-api";
+import { DirectoryStep, FileWriteConfig, OutputFunc } from "ssg-api";
 import { PeopleService } from "./PeopleService.js";
 import { CountryCode } from "../org/country/CountryCode.js";
 export type PeopleFilter = (p: People) => boolean;
@@ -13,7 +13,7 @@ export declare class PeopleDirectoryStep extends DirectoryStep {
     protected outputFunc: OutputFunc;
     protected service: PeopleService;
     protected filter: PeopleFilter;
-    constructor(name: string, rootDirs: string[], excludedDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: SsgConfig, service: PeopleService, filter?: PeopleFilter);
+    constructor(name: string, rootDirs: string[], excludedDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, 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/PeopleDirectoryStepFactory.d.ts

@@ -1,25 +1,38 @@
-import { OutputFunc, SsgConfig } from "ssg-api";
+import { FileWriteConfig, OutputFunc } from "ssg-api";
 import { PeopleService } from "./PeopleService.js";
 import { PeopleDirectoryStep } from "./PeopleDirectoryStep.js";
+export type PeopleDirectoryStepOptions = {
+    root: string;
+    scientists?: string;
+    ufologists?: string;
+    ufoWitnesses?: string;
+    astronomers?: string;
+    contactees?: string;
+    pilots?: string;
+    military?: string;
+    softwareEngineers?: string;
+    politicians?: string;
+    rulers?: string;
+};
 /**
  * Scan directories for people information, then populates a template with collected data.
  */
 export declare class PeopleDirectoryStepFactory {
     protected outputFunc: OutputFunc;
-    protected config: SsgConfig;
+    protected config: FileWriteConfig;
     protected service: PeopleService;
     protected excludedDirs: string[];
-    constructor(outputFunc: OutputFunc, config: SsgConfig, service: PeopleService, excludedDirs?: string[]);
-    create(): Promise<PeopleDirectoryStep[]>;
+    constructor(outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, excludedDirs: string[]);
+    create(options: PeopleDirectoryStepOptions): Promise<PeopleDirectoryStep[]>;
     createLetters(): Promise<PeopleDirectoryStep[]>;
-    createAll(dirs: string[]): PeopleDirectoryStep;
-    createMilitary(dirs: string[]): PeopleDirectoryStep;
-    createPolicitians(dirs: string[]): PeopleDirectoryStep[];
-    createSoftwareEngineers(dirs: string[]): PeopleDirectoryStep;
-    createPilots(dirs: string[]): PeopleDirectoryStep;
-    createContactees(dirs: string[]): PeopleDirectoryStep;
-    createAstronomers(dirs: string[]): PeopleDirectoryStep;
-    createWitnesses(dirs: string[]): PeopleDirectoryStep;
-    createUfologists(dirs: string[]): PeopleDirectoryStep;
-    createScientists(dirs: string[]): PeopleDirectoryStep;
+    createAll(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createMilitary(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createPoliticians(dirs: string[], templateFileName: string, rulersTemplateFileName?: string): PeopleDirectoryStep[];
+    createSoftwareEngineers(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createPilots(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createContactees(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createAstronomers(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createUfoWitnesses(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createUfologists(dirs: string[], templateFileName: string): PeopleDirectoryStep;
+    createScientists(dirs: string[], templateFileName: string): PeopleDirectoryStep;
 }

package/dist/people/PeopleDirectoryStepFactory.js

@@ -7,38 +7,57 @@ import path from "path";
  * Scan directories for people information, then populates a template with collected data.
  */
 export class PeopleDirectoryStepFactory {
-    constructor(outputFunc, config, service, excludedDirs = ["people/Astronomers_fichiers", "people/witness", "people/author"]) {
+    constructor(outputFunc, config, service, excludedDirs) {
         this.outputFunc = outputFunc;
         this.config = config;
         this.service = service;
         this.excludedDirs = excludedDirs;
     }
-    async create() {
+    async create(options) {
         const dirs = RR0FileUtil.findDirectoriesContaining("people*.json", "out");
-        const scientistsDirectoryStep = this.createScientists(dirs);
-        const ufologistsDirectoryStep = this.createUfologists(dirs);
-        const ufoWitnessesDirectoryStep = this.createWitnesses(dirs);
-        const astronomersDirectoryStep = this.createAstronomers(dirs);
-        const contacteesDirectoryStep = this.createContactees(dirs);
-        const pilotsDirectoryStep = this.createPilots(dirs);
-        const militaryDirectoryStep = this.createMilitary(dirs);
-        const politiciansDirectoryStep = this.createPolicitians(dirs);
-        const softwareEngineersDirectoryStep = this.createSoftwareEngineers(dirs);
-        const allPeopleDirectoryStep = this.createAll(dirs);
+        const allPeopleDirectoryStep = this.createAll(dirs, options.root);
         const letterDirectorySteps = await this.createLetters();
-        return [
-            scientistsDirectoryStep,
-            ufologistsDirectoryStep,
-            ufoWitnessesDirectoryStep,
-            astronomersDirectoryStep,
-            contacteesDirectoryStep,
-            pilotsDirectoryStep,
-            militaryDirectoryStep,
-            softwareEngineersDirectoryStep,
-            ...politiciansDirectoryStep,
+        const steps = [
             allPeopleDirectoryStep,
             ...letterDirectorySteps
         ];
+        const scientists = options.scientists;
+        if (scientists) {
+            steps.push(this.createScientists(dirs, scientists));
+        }
+        const ufologists = options.ufologists;
+        if (ufologists) {
+            steps.push(this.createUfologists(dirs, ufologists));
+        }
+        const ufoWitnesses = options.ufoWitnesses;
+        if (ufoWitnesses) {
+            steps.push(this.createUfoWitnesses(dirs, ufoWitnesses));
+        }
+        const astronomers = options.astronomers;
+        if (astronomers) {
+            steps.push(this.createAstronomers(dirs, astronomers));
+        }
+        const contactees = options.contactees;
+        if (contactees) {
+            steps.push(this.createContactees(dirs, contactees));
+        }
+        const pilots = options.pilots;
+        if (pilots) {
+            steps.push(this.createPilots(dirs, pilots));
+        }
+        const military = options.military;
+        if (military) {
+            steps.push(this.createMilitary(dirs, military));
+        }
+        const softwareEngineers = options.softwareEngineers;
+        if (softwareEngineers) {
+            steps.push(this.createSoftwareEngineers(dirs, softwareEngineers));
+        }
+        const politicians = options.politicians;
+        if (politicians) {
+            steps.push(...this.createPoliticians(dirs, politicians, options.rulers));
+        }
+        return steps;
     }
     async createLetters() {
         const letterDirs = await glob("people/*/");
@@ -52,38 +71,41 @@ export class PeopleDirectoryStepFactory {
         }
         return letterDirectorySteps;
     }
-    createAll(dirs) {
-        return new PeopleDirectoryStep("all people directories", dirs, this.excludedDirs, "people/index.html", this.outputFunc, this.config, this.service);
+    createAll(dirs, templateFileName) {
+        return new PeopleDirectoryStep("all people directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service);
     }
-    createMilitary(dirs) {
-        return new PeopleDirectoryStep("military people directories", dirs, this.excludedDirs, "people/militaires.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.military]));
+    createMilitary(dirs, templateFileName) {
+        return new PeopleDirectoryStep("military people directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.military]));
     }
-    createPolicitians(dirs) {
-        return [
-            new PeopleDirectoryStep("politicians directories", dirs, this.excludedDirs, "people/politicians.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.politician])),
-            new PeopleDirectoryStep("politician leaders directories", dirs, this.excludedDirs, "people/dirigeants.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.leader]))
+    createPoliticians(dirs, templateFileName, rulersTemplateFileName) {
+        const steps = [
+            new PeopleDirectoryStep("politicians directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, 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])));
+        }
+        return steps;
     }
-    createSoftwareEngineers(dirs) {
-        return new PeopleDirectoryStep("software engineers directories", dirs, this.excludedDirs, "tech/info/Personnes.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.softwareEngineer]));
+    createSoftwareEngineers(dirs, templateFileName) {
+        return new PeopleDirectoryStep("software engineers directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.softwareEngineer]));
     }
-    createPilots(dirs) {
-        return new PeopleDirectoryStep("pilots directories", dirs, this.excludedDirs, "people/pilotes.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.astronaut, Occupation.pilot]));
+    createPilots(dirs, templateFileName) {
+        return new PeopleDirectoryStep("pilots directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.astronaut, Occupation.pilot]));
     }
-    createContactees(dirs) {
-        return new PeopleDirectoryStep("contactees directories", dirs, this.excludedDirs, "people/contactes.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.contactee]));
+    createContactees(dirs, templateFileName) {
+        return new PeopleDirectoryStep("contactees directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.contactee]));
     }
-    createAstronomers(dirs) {
-        return new PeopleDirectoryStep("astronomers directories", dirs, this.excludedDirs, "people/astronomes.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.astronomer]));
+    createAstronomers(dirs, templateFileName) {
+        return new PeopleDirectoryStep("astronomers directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.astronomer]));
     }
-    createWitnesses(dirs) {
-        return new PeopleDirectoryStep(`UFO witnesses directories`, dirs, this.excludedDirs, "people/witness/index.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.ufoWitness, Occupation.ufoWitness2, Occupation.abductee, Occupation.contactee]));
+    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]));
     }
-    createUfologists(dirs) {
-        return new PeopleDirectoryStep("ufologists directories", dirs, this.excludedDirs, "people/ufologues.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.ufologist]));
+    createUfologists(dirs, templateFileName) {
+        return new PeopleDirectoryStep("ufologists directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, peopleOccupationFilter([Occupation.ufologist]));
     }
-    createScientists(dirs) {
-        return new PeopleDirectoryStep("scientists directories", dirs, this.excludedDirs, "people/scientifiques.html", this.outputFunc, this.config, this.service, peopleOccupationFilter([
+    createScientists(dirs, templateFileName) {
+        return new PeopleDirectoryStep("scientists directories", dirs, this.excludedDirs, templateFileName, this.outputFunc, this.config, this.service, 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

@@ -1,6 +1,5 @@
 import { People } from "./People.js";
-import { RR0Data, TypedDataFactory } from "../data/index.js";
-import { RR0EventFactory } from "../event/index.js";
+import { RR0Data, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 export declare class PeopleFactory extends TypedDataFactory<People> {
     constructor(eventFactory: RR0EventFactory);
     /**

package/dist/people/PeopleFactory.js

@@ -1,7 +1,7 @@
 import { People } from "./People.js";
 import path from "path";
 import { StringUtil } from "../util/index.js";
-import { TypedDataFactory } from "../data/index.js";
+import { TypedDataFactory } from "@rr0/data";
 export class PeopleFactory extends TypedDataFactory {
     constructor(eventFactory) {
         super(eventFactory, "people");

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

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

package/dist/people/PeopleFactory.test.js

@@ -0,0 +1,81 @@
+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("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);
+    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"));
+    });
+    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([]);
+    });
+});

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

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

package/dist/people/PeopleRegexReplaceCommand.test.js

@@ -0,0 +1,17 @@
+import { PeopleReplacerFactory } from "./PeopleReplacerFactory.js";
+import { rr0TestUtil } from "../test/index.js";
+import { ClassDomReplaceCommand } from "ssg-api";
+import { describe, expect, test } from "@javarome/testscript";
+import { PeopleService } from "./PeopleService.js";
+import path from "path";
+describe("ClassDomReplaceCommand", () => {
+    test("replaces", async () => {
+        const peopleRoot = "src/people";
+        const peopleFiles = [path.join(peopleRoot, "b/BeauJerome")];
+        const peopleService = new PeopleService(rr0TestUtil.dataService, rr0TestUtil.peopleFactory, peopleFiles);
+        const command = new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService), "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.test.d.ts

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

package/dist/people/PeopleReplacer.test.js

@@ -0,0 +1,58 @@
+import { PeopleReplacer } from "./PeopleReplacer.js";
+import { rr0TestUtil } from "../test/index.js";
+import { PeopleService } from "./PeopleService.js";
+import { describe, expect, test } from "@javarome/testscript";
+import { PeopleFactory } from "./PeopleFactory.js";
+import path from "path";
+import { AllDataService, RR0EventFactory } from "@rr0/data";
+describe("PeopleReplacer", () => {
+    const peopleRoot = "src/people";
+    const peopleFiles = [
+        path.join(peopleRoot, "b/BeauJerome"),
+        path.join(peopleRoot, "h/HynekJosefAllen")
+    ];
+    const peopleFactory = new PeopleFactory(new RR0EventFactory());
+    function createPeopleElement(context, content, title) {
+        const peopleElement = context.file.document.createElement("span");
+        peopleElement.textContent = content;
+        if (title) {
+            peopleElement.title = title;
+        }
+        return peopleElement;
+    }
+    test("ignore brackets", async () => {
+        const dataService = new AllDataService([peopleFactory]);
+        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles));
+        const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+        {
+            const lastnameFirstElement = createPeopleElement(context, "Hynek, Josef Allen (Northwestern University, Evanston, Illinois)");
+            const replacement = await replacer.replacement(context, lastnameFirstElement);
+            expect(replacement.outerHTML).toBe(`<span title="1910-1986, 76 ans, USA, ufologue, astronome" class="deceased country-us occupation-ufologist occupation-astronomer" translate="no"><a href="/src/people/h/HynekJosefAllen/">Hynek, Josef Allen (Northwestern University, Evanston, Illinois)</a></span>`);
+        }
+        {
+            const firstnameFirstElement = createPeopleElement(context, "Josef Allen Hynek (Northwestern University, Evanston, Illinois)");
+            const replacement = await replacer.replacement(context, firstnameFirstElement);
+            expect(replacement.outerHTML).toBe(`<span title="1910-1986, 76 ans, USA, ufologue, astronome" class="deceased country-us occupation-ufologist occupation-astronomer" translate="no"><a href="/src/people/h/HynekJosefAllen/">Josef Allen Hynek (Northwestern University, Evanston, Illinois)</a></span>`);
+        }
+    });
+    test("replace people tags", async () => {
+        const dataService = new AllDataService([peopleFactory]);
+        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles));
+        const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+        {
+            const peopleWithTitle = createPeopleElement(context, "Ronald Reagan", "Ronald Wilson Reagan");
+            let replacement = await replacer.replacement(context, peopleWithTitle);
+            expect(replacement.outerHTML).toBe(`<span translate="no"><a href="/src/people/r/ReaganRonald/">Ronald Reagan</a></span>`);
+        }
+        {
+            const peopleWithFullName = createPeopleElement(context, "Jérôme Beau");
+            let replacement = await replacer.replacement(context, peopleWithFullName);
+            expect(replacement.outerHTML).toBe(`<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>`);
+        }
+        {
+            const peopleWithLastName = createPeopleElement(context, "Beau");
+            let replacement = await replacer.replacement(context, peopleWithLastName);
+            expect(replacement.outerHTML).toBe(`<span title="1972-, 50 ans, France, ufologue, Informaticien" class="country-fr occupation-ufologist occupation-softwareEngineer" translate="no" title="Jérôme Beau"><a href="/src/people/b/BeauJerome/" title="Jérôme Beau">Beau</a></span>`);
+        }
+    });
+});

package/dist/people/PeopleService.d.ts

@@ -1,9 +1,9 @@
 import { People } from "./People.js";
 import { HtmlRR0Context } from "../RR0Context.js";
-import { AbstractDataService, AllDataService } from "../data/index.js";
 import { CountryCode } from "../org/index.js";
 import { Occupation } from "./Occupation.js";
 import { PeopleFactory } from "./PeopleFactory.js";
+import { AbstractDataService, AllDataService } from "@rr0/data";
 export declare class PeopleService extends AbstractDataService<People> {
     protected peopleFactory: PeopleFactory;
     readonly cache: Map<string, People>;

package/dist/people/PeopleService.js

@@ -1,8 +1,8 @@
 import { People } from "./People.js";
 import path from "path";
-import { AbstractDataFactory, AbstractDataService } from "../data/index.js";
 import { Time } from "../time/Time.js";
 import { Gender } from "@rr0/common";
+import { AbstractDataFactory, AbstractDataService } from "@rr0/data";
 export class PeopleService extends AbstractDataService {
     constructor(dataService, peopleFactory, files) {
         super(dataService, peopleFactory, files);

package/dist/people/author/AuthorReplaceCommandTest.d.ts

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

package/dist/people/author/AuthorReplaceCommandTest.js

@@ -0,0 +1,49 @@
+import { AuthorReplaceCommand } from "./AuthorReplaceCommand.js";
+import { rr0TestUtil } from "../../test/index.js";
+import { describe, expect, test } from "@javarome/testscript";
+import { RelativeTimeTextBuilder } from "../../time/index.js";
+describe("AuthorReplaceCommand", async () => {
+    const timeTextBuilder = rr0TestUtil.time.timeTextBuilder;
+    const relativeTimeTextBuilder = new RelativeTimeTextBuilder(timeTextBuilder);
+    const timeService = await rr0TestUtil.time.getService();
+    test("no author", async () => {
+        const timeFile = rr0TestUtil.time.filePath("1/9/5/4/index.html");
+        const command = new AuthorReplaceCommand(timeService);
+        const context = rr0TestUtil.newHtmlContext(timeFile, `This is published by <!--#echo var="author" -->!`);
+        await command.execute(context);
+        expect(context.file.meta.author).toEqual([]);
+        expect(context.file.contents).toBe("This is published by !");
+    });
+    test("author only", async () => {
+        const timeFile = rr0TestUtil.time.filePath("1/9/5/4/10/index.html");
+        const command = new AuthorReplaceCommand(timeService);
+        const context = rr0TestUtil.newHtmlContext(timeFile, `This is published by <!--#echo var="author" -->!`);
+        context.file.meta.author.push("Beau, Jérôme");
+        const time = relativeTimeTextBuilder.build(undefined, context);
+        await command.execute(context);
+        expect(context.file.meta.author).toEqual(["Beau, Jérôme"]);
+        expect(context.file.contents).toBe(`This is published by <div class="document-author"><span class="people">Beau, Jérôme</span>, <span class="time">${time}</span></div>!`);
+    });
+    test("copyright only", async () => {
+        const timeFile = rr0TestUtil.time.filePath("1/9/5/4/10/index.html");
+        const command = new AuthorReplaceCommand(timeService);
+        const context = rr0TestUtil.newHtmlContext(timeFile, `This is published by <!--#echo var="author" -->!`);
+        context.file.meta.copyright = "Some publication";
+        const time = relativeTimeTextBuilder.build(undefined, context);
+        await command.execute(context);
+        expect(context.file.meta.author).toEqual([]);
+        expect(context.file.meta.copyright).toBe("Some publication");
+        expect(context.file.contents).toBe(`This is published by <div class="document-author">Some publication</div>, <span class="time">${time}</span></div>!`);
+    });
+    test("author with copyright", async () => {
+        const timeFile = rr0TestUtil.time.filePath("1/9/5/4/10/index.html");
+        const command = new AuthorReplaceCommand(timeService);
+        const context = rr0TestUtil.newHtmlContext(timeFile, `This is published by <!--#echo var="author" -->!`);
+        context.file.meta.author.push("Beau, Jérôme");
+        context.file.meta.copyright = "Some publication";
+        await command.execute(context);
+        expect(context.file.meta.author).toEqual(["Beau, Jérôme"]);
+        expect(context.file.meta.copyright).toBe("Some publication");
+        expect(context.file.contents).toBe(`This is published by <div class="document-author"><span class="people">Beau, Jérôme</span>: Some publication</div>!`);
+    });
+});

package/dist/place/Place.d.ts

@@ -1,6 +1,5 @@
-import { RR0Data } from "../data/RR0Data.js";
-import { RR0Event } from "../event/RR0Event.js";
 import { PlaceLocation } from "@rr0/place";
+import { RR0Data, RR0Event } from "@rr0/data";
 export type Elevation = {
     elevation: number;
     data?: any;

package/dist/place/PlaceReplacer.test.d.ts

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