@rr0/cms 0.3.2 → 0.3.3

package/dist/BuildContext.d.ts

@@ -0,0 +1,7 @@
+import { CityService, DepartmentService } from "./org";
+import { CountryService } from "./org/country/CountryService";
+export interface BuildContext {
+    cityService: CityService;
+    departmentService: DepartmentService;
+    countryService: CountryService;
+}

package/dist/RR0Build.d.ts

@@ -1,6 +1,13 @@
-import { TimeServiceOptions } from "./time";
+import { RR0CaseMapping, TimeService, TimeServiceOptions, TimeTextBuilder } from "./time";
+import { CaseFactory } from "./science/index.js";
+import { CityService, DepartmentService, OrganizationService } from "./org/index.js";
+import { RR0ContextImpl } from "./RR0Context.js";
 import { FileWriteConfig } from "ssg-api";
 import { PeopleDirectoryStepOptions } from "./people";
+import { AllDataService, PeopleFactory } from "@rr0/data";
+import { GooglePlaceService } from "@rr0/place";
+import { CountryService } from "./org/country/CountryService";
+import { BuildContext } from "./BuildContext";
 export interface RR0BuildOptions {
     contentRoots: string[];
     copies: string[];
@@ -17,6 +24,7 @@ export interface RR0BuildOptions {
     sourceRegistryFileName: string;
     directoryExcluded: string[];
     directoryOptions: PeopleDirectoryStepOptions;
+    mappings: RR0CaseMapping<any>[];
 }
 export interface RR0BuildArgs {
     /**
@@ -45,20 +53,20 @@ export interface RR0BuildArgs {
      */
     force?: string;
 }
-export declare class RR0Build {
+export declare class RR0Build implements BuildContext {
     protected options: RR0BuildOptions;
-    config: FileWriteConfig;
-    private context;
-    private placeService;
-    private orgService;
-    private timeService;
-    private caseFactory;
-    private dataService;
-    private peopleFactory;
-    private timeTextBuilder;
-    private cityService;
-    private departmentService;
-    private countryService;
+    readonly config: FileWriteConfig;
+    readonly context: RR0ContextImpl;
+    readonly placeService: GooglePlaceService;
+    readonly orgService: OrganizationService<any>;
+    readonly timeService: TimeService;
+    readonly caseFactory: CaseFactory;
+    readonly dataService: AllDataService;
+    readonly peopleFactory: PeopleFactory;
+    readonly timeTextBuilder: TimeTextBuilder;
+    readonly cityService: CityService;
+    readonly departmentService: DepartmentService;
+    readonly countryService: CountryService;
     constructor(options: RR0BuildOptions);
     run(args: RR0BuildArgs): Promise<void>;
 }

package/dist/RR0Build.js

@@ -1,9 +1,9 @@
 import path from "path";
 import fs from "fs";
-import { BaseOvniFranceRR0Mapping, CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, FuforaRR0Mapping, HttpSource, NuforcRR0Mapping, RR0Mapping, SceauRR0Mapping, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder, UrecatRR0Mapping } from "./time";
+import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
 import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/index.js";
 import { PlaceReplacerFactory } from "./place/index.js";
-import { cities, CityService, countries, departments, DepartmentService, CmsOrganizationFactory, OrganizationService, regions, RegionService } from "./org/index.js";
+import { cities, CityService, CmsOrganizationFactory, countries, departments, DepartmentService, OrganizationService, regions, RegionService } from "./org/index.js";
 import { RR0ContextImpl } from "./RR0Context.js";
 import { HtmlTable } from "./util/index.js";
 import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
@@ -30,7 +30,6 @@ import { TimeContext } from "@rr0/time";
 import { writeFile } from "@javarome/fileutil";
 import { AllDataService, EventDataFactory, PeopleFactory, PeopleService, 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";
 import { CountryService } from "./org/country/CountryService";
 const outputFunc = async (context, outFile) => {
@@ -59,13 +58,14 @@ export class RR0Build {
         context.setVar("mapsApiKey", options.googleMapsApiKey);
         context.setVar("mail", options.mail);
         const eventFactory = new RR0EventFactory();
-        this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
         const orgFactory = new CmsOrganizationFactory(eventFactory);
-        this.orgService = new OrganizationService([], "org", orgFactory, undefined);
         const countryService = this.countryService = new CountryService(countries, "org", orgFactory, undefined);
         const regionService = new RegionService(regions, "org", orgFactory, countryService);
         const departmentService = this.departmentService = new DepartmentService(departments, "org", orgFactory, regionService);
-        this.cityService = new CityService(cities, "org", orgFactory, departmentService);
+        const cityService = new CityService(cities, "org", orgFactory, departmentService);
+        this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
+        this.orgService = new OrganizationService([], "org", orgFactory, undefined);
+        this.cityService = cityService;
         const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
         const timeOptions = options.timeOptions;
         const timeRoot = timeOptions.root;
@@ -131,21 +131,9 @@ export class RR0Build {
         const noteCounter = new NoteFileCounter();
         const noteRenderer = new NoteRenderer(noteCounter);
         const caseRenderer = new CaseSummaryRenderer(noteRenderer, sourceFactory, sourceRenderer, timeElementFactory);
-        // const actions: ChronologyReplacerActions = {read: ["backup", "fetch"], write: ["backup", "pages"]}
-        // const actions: ChronologyReplacerActions = {read: [], write: ["backup"]}
-        const actions = { read: ["fetch"], write: ["backup"] };
-        const rr0Mapping = new RR0Mapping(this.cityService, actions);
-        const geipanRR0Mapping = new GeipanRR0Mapping(this.cityService, actions);
-        const baseOvniFranceRR0Mapping = new BaseOvniFranceRR0Mapping(this.cityService, this.departmentService, actions);
-        const fuforaRR0Mapping = new FuforaRR0Mapping(this.cityService, actions);
-        const nuforcRR0Mapping = new NuforcRR0Mapping(this.cityService, this.countryService, actions);
-        const urecatRR0Mapping = new UrecatRR0Mapping(this.cityService, this.countryService, actions);
-        const sceauRR0Mapping = new SceauRR0Mapping(this.cityService, actions);
-        const databaseAggregationCommand = new DomReplaceCommand(".contents ul", new ChronologyReplacerFactory(timeService, [rr0Mapping,
-            geipanRR0Mapping,
-            baseOvniFranceRR0Mapping, fuforaRR0Mapping, nuforcRR0Mapping, urecatRR0Mapping,
-            sceauRR0Mapping
-        ], caseRenderer));
+        const mappings = this.options.mappings || [new RR0Mapping({ read: ["fetch"], write: ["backup"] })];
+        mappings.forEach(mapping => mapping.init(this));
+        const databaseAggregationCommand = new DomReplaceCommand(".contents ul", new ChronologyReplacerFactory(timeService, mappings, caseRenderer));
         const timeDefaultHandler = (context) => {
             let title;
             title = timeService.titleFromFile(context, context.file.name, timeTextBuilder);

package/dist/RR0Build.test.js

@@ -1,12 +1,14 @@
 import { glob } from "glob";
 import { describe } from "@javarome/testscript";
 import { RR0Build } from "./RR0Build.js";
+import { BaseOvniFranceRR0Mapping, FuforaRR0Mapping, NuforcRR0Mapping, RR0Mapping, SceauRR0Mapping, UrecatRR0Mapping } from "./time/index.js";
 import { testFilePath } from "./test";
 import * as process from "node:process";
+import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping";
 describe("Build", () => {
     console.time("ssg");
     const args = {
-        contents: ["test/org/us/faa/index.html"],
+        contents: ["test/**/*.html"],
         force: "true"
     };
     const cliContents = args.contents;
@@ -91,6 +93,21 @@ describe("Build", () => {
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
         const timeOptions = { root: testFilePath("time"), files: timeFiles };
+        // const actions: ChronologyReplacerActions = {read: ["backup", "fetch"], write: ["backup", "pages"]}
+        // const actions: ChronologyReplacerActions = {read: [], write: ["backup"]}
+        const actions = { read: ["fetch"], write: ["backup"] };
+        const rr0Mapping = new RR0Mapping(actions);
+        const geipanRR0Mapping = new GeipanRR0Mapping(actions);
+        const baseOvniFranceRR0Mapping = new BaseOvniFranceRR0Mapping(actions);
+        const fuforaRR0Mapping = new FuforaRR0Mapping(actions);
+        const nuforcRR0Mapping = new NuforcRR0Mapping(actions);
+        const urecatRR0Mapping = new UrecatRR0Mapping(actions);
+        const sceauRR0Mapping = new SceauRR0Mapping(actions);
+        const mappings = [rr0Mapping,
+            /*      geipanRR0Mapping,
+                  baseOvniFranceRR0Mapping, fuforaRR0Mapping, nuforcRR0Mapping, urecatRR0Mapping,
+                  sceauRR0Mapping*/
+        ];
         const build = new RR0Build({
             contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
             siteBaseUrl, timeFormat, directoryPages,
@@ -98,7 +115,8 @@ describe("Build", () => {
             ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(testFilePath),
             sourceRegistryFileName,
             directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(testFilePath),
-            directoryOptions
+            directoryOptions,
+            mappings
         });
         await build.run(args);
     });

package/dist/index.d.ts

@@ -29,3 +29,4 @@ export * from "./RR0DefaultCopyright.js";
 export * from "./RR0Context.js";
 export * from "./TableReplaceCommand.js";
 export * from "./RR0Build.js";
+export { BuildContext } from "./BuildContext";

package/dist/org/CmsOrganization.d.ts

@@ -1,8 +1,7 @@
 import { RR0Context } from "../RR0Context.js";
 import { OrganizationMessageOptions, OrganizationMessages } from "./OrganizationMessages.js";
 import { TitleMessage } from "./TitleMessage.js";
-import { Organization } from "@rr0/data";
-import { OrganizationKind } from "@rr0/data";
+import { Organization, OrganizationKind } from "@rr0/data";
 import { Place } from "@rr0/place";
 export declare class CmsOrganization<M extends TitleMessage = OrganizationMessages> extends Organization {
     constructor(id: string, places: Place[], kind: OrganizationKind, parent?: CmsOrganization);

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanDatasource.test.js

@@ -5,7 +5,7 @@ import { DatasourceTestCase } from "../../../../../../time/datasource/Datasource
 import { rr0TestUtil } from "../../../../../../test/index.js";
 describe("GeipanCaseSource", () => {
     const actions = { read: ["backup", "fetch"], write: ["backup", "pages"] };
-    const geipanRR0Mapping = new GeipanRR0Mapping(rr0TestUtil.cityService, actions);
+    const geipanRR0Mapping = new GeipanRR0Mapping(actions).init(rr0TestUtil);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.d.ts

@@ -3,13 +3,14 @@ import { GeipanCaseSummaryRR0Mapper } from "./GeipanCaseSummaryRR0Mapper.js";
 import { GeipanFileDatasource } from "./GeipanFileDatasource.js";
 import { GeipanCaseSummary } from "./GeipanCaseSummary.js";
 import { ChronologyReplacerActions, RR0CaseMapping } from "../../../../../../time/index.js";
-import { CityService } from "../../../../../country";
+import { BuildContext } from "../../../../../../BuildContext";
 export declare const geipanHttpDatasource: GeipanHttpDatasource;
 export declare const geipanFileDatasource: GeipanFileDatasource;
 export declare class GeipanRR0Mapping implements RR0CaseMapping<GeipanCaseSummary> {
     readonly actions: ChronologyReplacerActions;
-    readonly datasource: GeipanHttpDatasource;
-    readonly backupDatasource: GeipanFileDatasource;
-    readonly mapper: GeipanCaseSummaryRR0Mapper;
-    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+    datasource: GeipanHttpDatasource;
+    backupDatasource: GeipanFileDatasource;
+    mapper: GeipanCaseSummaryRR0Mapper;
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.js

@@ -4,10 +4,13 @@ import { GeipanFileDatasource } from "./GeipanFileDatasource.js";
 export const geipanHttpDatasource = new GeipanHttpDatasource(new URL("https://geipan.fr"), "fr/recherche/cas");
 export const geipanFileDatasource = new GeipanFileDatasource("org/eu/fr/cnes/geipan/export_cas_pub_20210219111412.csv", "latin1");
 export class GeipanRR0Mapping {
-    constructor(cityService, actions) {
+    constructor(actions) {
         this.actions = actions;
         this.datasource = geipanHttpDatasource;
         this.backupDatasource = geipanFileDatasource;
-        this.mapper = new GeipanCaseSummaryRR0Mapper(cityService, geipanHttpDatasource.baseUrl, geipanHttpDatasource.copyright, geipanHttpDatasource.authors);
+    }
+    init(build) {
+        this.mapper = new GeipanCaseSummaryRR0Mapper(build.cityService, geipanHttpDatasource.baseUrl, geipanHttpDatasource.copyright, geipanHttpDatasource.authors);
+        return this;
     }
 }

package/dist/people/PeopleDirectoryStep.js

@@ -26,7 +26,7 @@ export class PeopleDirectoryStep extends DirectoryStep {
             var _a;
             if (((_a = peopleInfo.pseudonyms) === null || _a === void 0 ? void 0 : _a.length) > 0) {
                 for (const pseudonym of peopleInfo.pseudonyms) {
-                    const pseudo = new People(peopleInfo.firstNames, peopleInfo.lastName, peopleInfo.pseudonyms, peopleInfo.occupations, peopleInfo.countries, peopleInfo.discredited, peopleInfo.birthTime, peopleInfo.deathTime, peopleInfo.gender, peopleInfo.id, peopleInfo.dirName, peopleInfo.image);
+                    const pseudo = new People(peopleInfo.firstNames, peopleInfo.lastName, peopleInfo.pseudonyms, peopleInfo.occupations, peopleInfo.countries, peopleInfo.discredited, peopleInfo.gender, peopleInfo.id, peopleInfo.dirName, peopleInfo.image);
                     pseudo.lastAndFirstName = pseudonym;
                     prevPeopleList.push(pseudo);
                 }

package/dist/people/PeopleDirectoryStepFactory.d.ts

@@ -16,7 +16,7 @@ export type PeopleDirectoryStepOptions = {
     rulers?: string;
 };
 /**
- * Scan directories for people information, then populates a template with collected data.
+ * Create directory steps for different types of people.
  */
 export declare class PeopleDirectoryStepFactory {
     protected outputFunc: OutputFunc;
@@ -26,6 +26,9 @@ export declare class PeopleDirectoryStepFactory {
     protected excludedDirs: string[];
     constructor(outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, renderer: PeopleHtmlRenderer, excludedDirs: string[]);
     create(options: PeopleDirectoryStepOptions): Promise<PeopleDirectoryStep[]>;
+    /**
+     * Create steps to generate directory pages for people with name starting with every first letter.
+     */
     createLetters(): Promise<PeopleDirectoryStep[]>;
     createAll(dirs: string[], templateFileName: string): PeopleDirectoryStep;
     createMilitary(dirs: string[], templateFileName: string): PeopleDirectoryStep;

package/dist/people/PeopleDirectoryStepFactory.js

@@ -4,7 +4,7 @@ import { glob } from "glob";
 import path from "path";
 import { Occupation } from "@rr0/data";
 /**
- * Scan directories for people information, then populates a template with collected data.
+ * Create directory steps for different types of people.
  */
 export class PeopleDirectoryStepFactory {
     constructor(outputFunc, config, service, renderer, excludedDirs) {
@@ -60,6 +60,9 @@ export class PeopleDirectoryStepFactory {
         }
         return steps;
     }
+    /**
+     * Create steps to generate directory pages for people with name starting with every first letter.
+     */
     async createLetters() {
         const letterDirs = await glob("people/*/");
         const peopleLetterFiles = letterDirs.filter(l => /(.+)\/[a-z]$/.test(l));

package/dist/test/RR0TestUtil.d.ts

@@ -1,11 +1,12 @@
 import { HtmlRR0Context, RR0Context } from "../RR0Context.js";
 import { FileWriteConfig } from "ssg-api";
-import { CityService, DepartmentService, CmsOrganizationFactory, OrganizationService, RegionService } from "../org/index.js";
+import { CityService, CmsOrganizationFactory, DepartmentService, OrganizationService, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
 import { AllDataService, PeopleFactory } from "@rr0/data";
 import { CountryService } from "../org/country/CountryService";
-export declare class RR0TestUtil {
+import { BuildContext } from "../BuildContext";
+export declare class RR0TestUtil implements BuildContext {
     readonly rootDir: string;
     readonly outDir: string;
     readonly config: FileWriteConfig;

package/dist/test/RR0TestUtil.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { RR0ContextImpl } from "../RR0Context.js";
 import { HtmlFileContents } from "ssg-api";
-import { cities, CityService, countries, departments, DepartmentService, CmsOrganizationFactory, OrganizationService, regions, RegionService } from "../org/index.js";
+import { cities, CityService, CmsOrganizationFactory, countries, departments, DepartmentService, OrganizationService, regions, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
 import { APIFactory } from "../tech/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";

package/dist/time/datasource/ChronologyReplacer.test.js

@@ -19,7 +19,7 @@ describe("ChronologyReplacer", () => {
         const sourceFactory = new SourceFactory(dataService, http, baseUrl, rr0TestUtil.intlOptions, timeTestUtil.getService());
         const timeTextBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
         const caseRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(timeTextBuilder), timeTestUtil.timeElementFactory);
-        const urecatRR0Mapping = new UrecatRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.countryService, { read: ["fetch"], write: ["backup"] });
+        const urecatRR0Mapping = new UrecatRR0Mapping({ read: ["fetch"], write: ["backup"] }).init(rr0TestUtil);
         chronologyReplacer = new ChronologyReplacer([urecatRR0Mapping], caseRenderer);
         context = timeTestUtil.newHtmlContext("index.html");
         context.time.setYear(undefined);

package/dist/time/datasource/JsonMapper.test.js

@@ -10,7 +10,7 @@ describe("JsonMapper", () => {
         context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html", undefined, "en");
     });
     test("read", () => {
-        const ufoSearchMapping = new UfoSearchRR0Mapping(rr0TestUtil.cityService, { read: ["fetch"], write: ["backup"] });
+        const ufoSearchMapping = new UfoSearchRR0Mapping({ read: ["fetch"], write: ["backup"] }).init(rr0TestUtil);
         const ufoSearchFileDatasource = ufoSearchMapping.backupDatasource;
         const data = fs.readFileSync(path.join("src", ufoSearchFileDatasource.fileName), { encoding: "utf-8" });
         const cases = ufoSearchFileDatasource.fileMapper.parse(context, data);

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

@@ -4,7 +4,7 @@ import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { BaseOvniFranceRR0Mapping, baseOvniFranceSortComparator } from "./BaseOvniFranceRR0Mapping.js";
 describe("BaseOvniFranceCaseSource", () => {
-    const baseOvniFranceRR0Mapping = new BaseOvniFranceRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.departmentService, { read: ["fetch"], write: ["backup"] });
+    const baseOvniFranceRR0Mapping = new BaseOvniFranceRR0Mapping({ read: ["fetch"], write: ["backup"] }).init(rr0TestUtil);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

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

@@ -3,12 +3,13 @@ import { BaseOvniFranceCaseSummary } from "./BaseOvniFranceCaseSummary.js";
 import { BaseOvniFranceHttpDatasource } from "./BaseOvniFranceHttpDatasource.js";
 import { RR0CaseMapping } from "../rr0/index.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
-import { CityService, DepartmentService } from "../../../org";
+import { BuildContext } from "../../../BuildContext";
 export declare const baseOvniFranceDatasource: BaseOvniFranceHttpDatasource;
 export declare class BaseOvniFranceRR0Mapping implements RR0CaseMapping<BaseOvniFranceCaseSummary> {
     readonly actions: ChronologyReplacerActions;
-    readonly datasource: BaseOvniFranceHttpDatasource;
-    readonly mapper: BaseOvniFranceCaseSummaryRR0Mapper;
-    constructor(cityService: CityService, departmentService: DepartmentService, actions: ChronologyReplacerActions);
+    datasource: BaseOvniFranceHttpDatasource;
+    mapper: BaseOvniFranceCaseSummaryRR0Mapper;
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }
 export declare const baseOvniFranceSortComparator: (c1: BaseOvniFranceCaseSummary, c2: BaseOvniFranceCaseSummary) => 0 | 1 | -1;

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

@@ -2,10 +2,13 @@ import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryR
 import { BaseOvniFranceHttpDatasource } from "./BaseOvniFranceHttpDatasource.js";
 export const baseOvniFranceDatasource = new BaseOvniFranceHttpDatasource();
 export class BaseOvniFranceRR0Mapping {
-    constructor(cityService, departmentService, actions) {
+    constructor(actions) {
         this.actions = actions;
+    }
+    init(build) {
         const datasource = this.datasource = baseOvniFranceDatasource;
-        this.mapper = new BaseOvniFranceCaseSummaryRR0Mapper(departmentService, cityService, datasource.baseUrl, datasource.copyright, datasource.authors);
+        this.mapper = new BaseOvniFranceCaseSummaryRR0Mapper(build.departmentService, build.cityService, datasource.baseUrl, datasource.copyright, datasource.authors);
+        return this;
     }
 }
 export const baseOvniFranceSortComparator = (c1, c2) => c1.id < c2.id ? -1 : c1.id > c2.id ? 1 : 0;

package/dist/time/datasource/fufora/FuforaDatasource.test.js

@@ -4,7 +4,7 @@ import { fuforaTestCases } from "./FuforaTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { FuforaRR0Mapping } from "./FuforaRR0Mapping";
 describe("FuforaCaseSource", () => {
-    const fuforaRR0Mapping = new FuforaRR0Mapping(rr0TestUtil.cityService, { read: ["fetch"], write: ["backup"] });
+    const fuforaRR0Mapping = new FuforaRR0Mapping({ read: ["fetch"], write: ["backup"] }).init(rr0TestUtil);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/fufora/FuforaRR0Mapping.d.ts

@@ -2,12 +2,13 @@ import { FuforaHttpDatasource } from "./FuforaHttpDatasource.js";
 import { FuforaCaseSummaryRR0Mapper } from "./FuforaCaseSummaryRR0Mapper.js";
 import { RR0CaseMapping } from "../rr0/RR0CaseMapping.js";
 import { FuforaCaseSummary } from "./FuforaCaseSummary.js";
-import { CityService } from "../../../org";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
+import { BuildContext } from "../../../BuildContext";
 export declare const fuforaDatasource: FuforaHttpDatasource;
 export declare class FuforaRR0Mapping implements RR0CaseMapping<FuforaCaseSummary> {
     readonly actions: ChronologyReplacerActions;
     mapper: FuforaCaseSummaryRR0Mapper;
     datasource: FuforaHttpDatasource;
-    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/fufora/FuforaRR0Mapping.js

@@ -2,9 +2,12 @@ import { FuforaHttpDatasource } from "./FuforaHttpDatasource.js";
 import { FuforaCaseSummaryRR0Mapper } from "./FuforaCaseSummaryRR0Mapper.js";
 export const fuforaDatasource = new FuforaHttpDatasource(new URL("https://www.fufora.fi"), "ufodb2/ufohaku.php");
 export class FuforaRR0Mapping {
-    constructor(cityService, actions) {
+    constructor(actions) {
         this.actions = actions;
         this.datasource = fuforaDatasource;
-        this.mapper = new FuforaCaseSummaryRR0Mapper(cityService, fuforaDatasource.baseUrl, fuforaDatasource.copyright, fuforaDatasource.authors);
+    }
+    init(build) {
+        this.mapper = new FuforaCaseSummaryRR0Mapper(build.cityService, fuforaDatasource.baseUrl, fuforaDatasource.copyright, fuforaDatasource.authors);
+        return this;
     }
 }

package/dist/time/datasource/nuforc/NuforcDatasource.test.js

@@ -4,7 +4,7 @@ import { nuforcTestCases } from "./NuforcTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { NuforcRR0Mapping } from "./NuforcRR0Mapping";
 describe("NuforcCaseSource", () => {
-    const nuforcRR0Mapping = new NuforcRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.countryService, { read: ["fetch"], write: ["backup"] });
+    const nuforcRR0Mapping = new NuforcRR0Mapping({ read: ["fetch"], write: ["backup"] }).init(rr0TestUtil);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/nuforc/NuforcRR0Mapping.d.ts

@@ -1,14 +1,14 @@
 import { NuforcRR0Mapper } from "./NuforcRR0Mapper.js";
 import { NuforcHttpDatasource } from "./NuforcHttpDatasource.js";
-import { CityService } from "../../../org";
 import { RR0CaseMapping } from "../rr0";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
 import { NuforcCaseSummary } from "./NuforcCaseSummary";
-import { CountryService } from "../../../org/country/CountryService";
+import { BuildContext } from "../../../BuildContext";
 export declare const nuforcDatasource: NuforcHttpDatasource;
 export declare class NuforcRR0Mapping implements RR0CaseMapping<NuforcCaseSummary> {
     readonly actions: ChronologyReplacerActions;
     datasource: NuforcHttpDatasource;
     mapper: NuforcRR0Mapper;
-    constructor(cityService: CityService, countryService: CountryService, actions: ChronologyReplacerActions);
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/nuforc/NuforcRR0Mapping.js

@@ -2,9 +2,12 @@ import { NuforcRR0Mapper } from "./NuforcRR0Mapper.js";
 import { NuforcHttpDatasource } from "./NuforcHttpDatasource.js";
 export const nuforcDatasource = new NuforcHttpDatasource();
 export class NuforcRR0Mapping {
-    constructor(cityService, countryService, actions) {
+    constructor(actions) {
         this.actions = actions;
         this.datasource = nuforcDatasource;
-        this.mapper = new NuforcRR0Mapper(cityService, countryService, nuforcDatasource.baseUrl.href, nuforcDatasource.copyright, nuforcDatasource.authors);
+    }
+    init(build) {
+        this.mapper = new NuforcRR0Mapper(build.cityService, build.countryService, nuforcDatasource.baseUrl.href, nuforcDatasource.copyright, nuforcDatasource.authors);
+        return this;
     }
 }

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

@@ -1,10 +1,12 @@
 import { CaseMapping } from "../CaseMapping.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
+import { BuildContext } from "../../../BuildContext";
 /**
  * Maps some datasource case to a RR0 case.
  *
  * @param S The source case type.
  */
 export interface RR0CaseMapping<S> extends CaseMapping<HtmlRR0Context, S, RR0CaseSummary> {
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/rr0/RR0Datasource.test.d.ts

@@ -7,6 +7,7 @@ import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
 import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper";
 import { RR0FileDatasource } from "./RR0FileDatasource";
+import { BuildContext } from "../../../BuildContext";
 export declare class RR0TestDatasource extends RR0Datasource implements Datasource<RR0CaseSummary> {
     timeTextBuilder: TimeTextBuilder;
     constructor();
@@ -14,8 +15,9 @@ export declare class RR0TestDatasource extends RR0Datasource implements Datasour
 }
 export declare class RR0TestMapping implements RR0CaseMapping<RR0CaseSummary> {
     readonly actions: ChronologyReplacerActions;
-    readonly datasource: RR0TestDatasource;
-    readonly backupDatasource: RR0FileDatasource;
-    readonly mapper: RR0CaseSummaryMapper;
+    datasource: RR0TestDatasource;
+    backupDatasource: RR0FileDatasource;
+    mapper: RR0CaseSummaryMapper;
     constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/rr0/RR0Datasource.test.js

@@ -20,8 +20,11 @@ export class RR0TestMapping {
     constructor(actions) {
         this.actions = actions;
         this.datasource = new RR0TestDatasource();
+    }
+    init(build) {
         this.mapper = new RR0CaseSummaryMapper(new URL("https://rr0.org"), "time", ["Beau, Jérôme"]);
         this.backupDatasource = new RR0FileDatasource(this.mapper);
+        return this;
     }
 }
 describe("RR0CaseSource", () => {

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

@@ -14,7 +14,8 @@ export class RR0HttpDatasource extends RR0Datasource {
     }
     static id(dateTime, place) {
         var _a;
-        return dateTime.toString() + (place instanceof OrganizationPlace ? "$" + ((_a = place.org) === null || _a === void 0 ? void 0 : _a.dirName.replaceAll("/", "_")) : "");
+        const dirName = (_a = place.org) === null || _a === void 0 ? void 0 : _a.dirName;
+        return `${dateTime.toString()}-${place.id || place.name}`;
     }
     getFromRows(context, rows) {
         const cases = [];

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

@@ -3,14 +3,15 @@ import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { RR0CaseMapping } from "./RR0CaseMapping.js";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";
-import { CityService } from "../../../org";
 import { RR0Datasource } from "./RR0Datasource";
+import { BuildContext } from "../../../BuildContext";
 export declare class RR0Mapping implements RR0CaseMapping<RR0CaseSummary> {
     readonly actions: ChronologyReplacerActions;
     static baseUrl: URL;
     static searchPath: string;
-    readonly datasource: RR0Datasource;
-    readonly backupDatasource: RR0FileDatasource;
-    readonly mapper: RR0CaseSummaryMapper;
-    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+    datasource: RR0Datasource;
+    backupDatasource: RR0FileDatasource;
+    mapper: RR0CaseSummaryMapper;
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

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

@@ -2,11 +2,14 @@ import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper.js";
 import { RR0HttpDatasource } from "./RR0HttpDatasource.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";
 export class RR0Mapping {
-    constructor(cityService, actions) {
+    constructor(actions) {
         this.actions = actions;
-        const rr0HttpDatasource = this.datasource = new RR0HttpDatasource(RR0Mapping.baseUrl, RR0Mapping.searchPath, cityService);
+    }
+    init(build) {
+        const rr0HttpDatasource = this.datasource = new RR0HttpDatasource(RR0Mapping.baseUrl, RR0Mapping.searchPath, build.cityService);
         const csvMapper = this.mapper = new RR0CaseSummaryMapper(rr0HttpDatasource.baseUrl, rr0HttpDatasource.searchPath, rr0HttpDatasource.authors);
         this.backupDatasource = new RR0FileDatasource(csvMapper);
+        return this;
     }
 }
 RR0Mapping.baseUrl = new URL("https://rr0.org");

package/dist/time/datasource/sceau/SceauDatasource.test.d.ts

@@ -5,6 +5,7 @@ import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
+import { BuildContext } from "../../../BuildContext";
 export declare class SceauTestDatasource extends SceauDatasource {
     timeTextBuilder: TimeTextBuilder;
     constructor();
@@ -12,7 +13,8 @@ export declare class SceauTestDatasource extends SceauDatasource {
 }
 export declare class SceauTestMapping implements SceauCaseMapping {
     readonly actions: ChronologyReplacerActions;
-    readonly datasource: import("./SceauHttpDatasource.js").SceauHttpDatasource;
-    readonly mapper: SceauCaseSummaryRR0Mapper;
+    datasource: import("./SceauHttpDatasource.js").SceauHttpDatasource;
+    mapper: SceauCaseSummaryRR0Mapper;
     constructor(actions?: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/sceau/SceauDatasource.test.js

@@ -21,7 +21,10 @@ export class SceauTestMapping {
     constructor(actions = { read: ["fetch"], write: ["backup"] }) {
         this.actions = actions;
         this.datasource = sceauDatasource; // new SceauTestDatasource()
+    }
+    init(build) {
         this.mapper = new SceauCaseSummaryRR0Mapper(rr0TestUtil.cityService, sceauDatasource.baseUrl, sceauDatasource.copyright, sceauDatasource.authors);
+        return this;
     }
 }
 describe("SCEAUCaseSource", () => {

package/dist/time/datasource/sceau/SceauRR0Mapping.d.ts

@@ -3,11 +3,12 @@ import { RR0CaseMapping } from "../rr0/index.js";
 import { SceauCaseSummary } from "./SceauCaseSummary.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper.js";
-import { CityService } from "../../../org";
+import { BuildContext } from "../../../BuildContext";
 export declare const sceauDatasource: SceauHttpDatasource;
 export declare class SceauRR0Mapping implements RR0CaseMapping<SceauCaseSummary> {
     readonly actions: ChronologyReplacerActions;
     datasource: SceauHttpDatasource;
     mapper: SceauCaseSummaryRR0Mapper;
-    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/sceau/SceauRR0Mapping.js

@@ -2,9 +2,12 @@ import { SceauHttpDatasource } from "./SceauHttpDatasource.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper.js";
 export const sceauDatasource = new SceauHttpDatasource(new URL("https://sceau-archives-ovni.org"));
 export class SceauRR0Mapping {
-    constructor(cityService, actions) {
+    constructor(actions) {
         this.actions = actions;
         this.datasource = sceauDatasource;
-        this.mapper = new SceauCaseSummaryRR0Mapper(cityService, sceauDatasource.baseUrl, sceauDatasource.copyright, sceauDatasource.authors);
+    }
+    init(build) {
+        this.mapper = new SceauCaseSummaryRR0Mapper(build.cityService, sceauDatasource.baseUrl, sceauDatasource.copyright, sceauDatasource.authors);
+        return this;
     }
 }

package/dist/time/datasource/ufo-search/UfoSearchDatasource.test.js

@@ -4,7 +4,7 @@ import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { ufoSearchTestCases } from "./UfoSearchTestCases.js";
 import { UfoSearchRR0Mapping } from "./UfoSearchMapping";
 describe("UfoSearchCaseSource", () => {
-    const ufoSearchRR0Mapping = new UfoSearchRR0Mapping(rr0TestUtil.cityService, { read: ["fetch"], write: ["backup"] });
+    const ufoSearchRR0Mapping = new UfoSearchRR0Mapping({ read: ["fetch"], write: ["backup"] }).init(rr0TestUtil);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/ufo-search/UfoSearchMapping.d.ts

@@ -4,12 +4,13 @@ import { UfoSearchCaseRR0Mapper } from "./UfoSearchCaseRR0Mapper.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { RR0CaseMapping } from "../rr0";
 import { UfoSearchCase } from "./UfoSearchCase";
-import { CityService } from "../../../org";
+import { BuildContext } from "../../../BuildContext";
 export declare const ufoSearchHttpDatasource: UfoSearchHttpDatasource;
 export declare class UfoSearchRR0Mapping implements RR0CaseMapping<UfoSearchCase> {
     readonly actions: ChronologyReplacerActions;
     datasource: UfoSearchHttpDatasource;
     backupDatasource: UfoSearchFileDatasource;
     mapper: UfoSearchCaseRR0Mapper;
-    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/ufo-search/UfoSearchMapping.js

@@ -3,10 +3,13 @@ import { UfoSearchFileDatasource } from "./UfoSearchFileDatasource.js";
 import { UfoSearchCaseRR0Mapper } from "./UfoSearchCaseRR0Mapper.js";
 export const ufoSearchHttpDatasource = new UfoSearchHttpDatasource("https://www.ufo-search.com", "timeline/search.html");
 export class UfoSearchRR0Mapping {
-    constructor(cityService, actions) {
+    constructor(actions) {
         this.actions = actions;
         this.datasource = ufoSearchHttpDatasource;
-        this.mapper = new UfoSearchCaseRR0Mapper(cityService, ufoSearchHttpDatasource.baseUrl, ufoSearchHttpDatasource.copyright, ufoSearchHttpDatasource.authors);
+    }
+    init(build) {
+        this.mapper = new UfoSearchCaseRR0Mapper(build.cityService, ufoSearchHttpDatasource.baseUrl, ufoSearchHttpDatasource.copyright, ufoSearchHttpDatasource.authors);
         this.backupDatasource = new UfoSearchFileDatasource("time/datasource/ufo-search/majestic.json", this.mapper);
+        return this;
     }
 }

package/dist/time/datasource/urecat/UrecatDatasource.test.js

@@ -4,7 +4,8 @@ import { urecatTestCases } from "./UrecatTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { UrecatRR0Mapping } from "./UrecatRR0Mapping";
 describe("UrecatCaseSource", () => {
-    const urecatRR0Mapping = new UrecatRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.countryService, { read: ["fetch"], write: ["backup"] });
+    const urecatRR0Mapping = new UrecatRR0Mapping({ read: ["fetch"], write: ["backup"] });
+    urecatRR0Mapping.init(rr0TestUtil);
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/urecat/UrecatRR0Mapping.d.ts

@@ -3,12 +3,12 @@ import { UrecatHttpDatasource } from "./UrecatHttpDatasource.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { RR0CaseMapping } from "../rr0";
 import { UrecatCase } from "./UrecatCase";
-import { CityService } from "../../../org";
-import { CountryService } from "../../../org/country/CountryService";
+import { BuildContext } from "../../../BuildContext";
 export declare const urecatDatasource: UrecatHttpDatasource;
 export declare class UrecatRR0Mapping implements RR0CaseMapping<UrecatCase> {
     readonly actions: ChronologyReplacerActions;
     datasource: UrecatHttpDatasource;
     mapper: UrecatRR0Mapper;
-    constructor(cityService: CityService, countryService: CountryService, actions: ChronologyReplacerActions);
+    constructor(actions: ChronologyReplacerActions);
+    init(build: BuildContext): this;
 }

package/dist/time/datasource/urecat/UrecatRR0Mapping.js

@@ -2,9 +2,12 @@ import { UrecatRR0Mapper } from "./UrecatRR0Mapper.js";
 import { UrecatHttpDatasource } from "./UrecatHttpDatasource.js";
 export const urecatDatasource = new UrecatHttpDatasource(new URL("https://ufologie.patrickgross.org"), "ce3");
 export class UrecatRR0Mapping {
-    constructor(cityService, countryService, actions) {
+    constructor(actions) {
         this.actions = actions;
         this.datasource = urecatDatasource;
-        this.mapper = new UrecatRR0Mapper(cityService, countryService, urecatDatasource.baseUrl, urecatDatasource.copyright, urecatDatasource.authors);
+    }
+    init(build) {
+        this.mapper = new UrecatRR0Mapper(build.cityService, build.countryService, urecatDatasource.baseUrl, urecatDatasource.copyright, urecatDatasource.authors);
+        return this;
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,10 +30,10 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.6",
     "@rr0/common": "^1.1.3",
-    "@rr0/data": "^0.3.4",
+    "@rr0/data": "^0.3.5",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.1",
-    "@rr0/time": "^0.9.2",
+    "@rr0/time": "^0.10.0",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",
     "glob": "^11.0.0",

package/dist/people/PeopleFactory.test.js

@@ -1,25 +0,0 @@
-import { describe, expect, test } from "@javarome/testscript";
-import { CountryCode, Occupation, People, PeopleFactory, RR0EventFactory } from "@rr0/data";
-describe("PeopleFactory", () => {
-    const eventFactory = new RR0EventFactory();
-    const factory = new PeopleFactory(eventFactory);
-    test("build people with two first names", () => {
-        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);
-    });
-});