@rr0/cms 0.3.16 → 0.3.19

package/dist/CMSContext.d.ts

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

package/dist/{RR0Build.d.ts → CMSGenerator.d.ts}

@@ -1,16 +1,17 @@
-import { RR0CaseMapping, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
-import { CaseFactory } from "./science/index.js";
+import { HttpSource, RR0CaseMapping, TimeElementFactory, TimeRenderer, TimeReplacer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time/index.js";
+import { CaseFactory } from "./science/crypto/ufo/enquete/dossier/index.js";
 import { CityService, DepartmentService, OrganizationService } from "./org/index.js";
 import { HtmlRR0Context, RR0ContextImpl } from "./RR0Context.js";
-import { FileWriteConfig } from "ssg-api";
-import { PeopleDirectoryStepOptions } from "./people";
-import { AllDataService, PeopleFactory } from "@rr0/data";
+import { FileWriteConfig, ReplaceCommand } from "ssg-api";
+import { PeopleDirectoryStepOptions } from "./people/index.js";
+import { PersistentSourceRegistry, SourceRenderer, SourceReplacerFactory } from "./source/index.js";
+import { AllDataService, PeopleFactory, PeopleService } from "@rr0/data";
 import { GooglePlaceService } from "@rr0/place";
-import { CountryService } from "./org/country/CountryService";
-import { BuildContext } from "./BuildContext";
-import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace";
-import { TimeOptions } from "./time/TimeOptions";
-export interface RR0BuildOptions {
+import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer.js";
+import { CountryService } from "./org/country/CountryService.js";
+import { CMSContext } from "./CMSContext.js";
+import { TimeOptions } from "./time/TimeOptions.js";
+export interface CMSGeneratorOptions {
     contentRoots: string[];
     copies: string[];
     outDir: string;
@@ -27,9 +28,9 @@ export interface RR0BuildOptions {
     directoryExcluded: string[];
     directoryOptions: PeopleDirectoryStepOptions;
     mappings: RR0CaseMapping<any>[];
-    contentReplacers: ReplaceCommand<HtmlRR0Context>[];
+    contentReplacers?: ReplaceCommand<HtmlRR0Context>[];
 }
-export interface RR0BuildArgs {
+export interface CMSGenerationOptions {
     /**
      * Configuration file name.
      */
@@ -56,8 +57,8 @@ export interface RR0BuildArgs {
      */
     force?: string;
 }
-export declare class RR0Build implements BuildContext {
-    protected options: RR0BuildOptions;
+export declare class CMSGenerator implements CMSContext {
+    protected options: CMSGeneratorOptions;
     readonly config: FileWriteConfig;
     readonly context: RR0ContextImpl;
     readonly placeService: GooglePlaceService;
@@ -72,6 +73,24 @@ export declare class RR0Build implements BuildContext {
     readonly timeService: TimeService;
     readonly timeRenderer: TimeRenderer;
     readonly timeUrlBuilder: TimeUrlBuilder;
-    constructor(options: RR0BuildOptions);
-    run(args: RR0BuildArgs): Promise<void>;
+    readonly http: HttpSource;
+    constructor(options: CMSGeneratorOptions);
+    generate(args: CMSGenerationOptions): Promise<void>;
+    protected setupSources(timeTextBuilder: TimeTextBuilder, timeFormat: Intl.DateTimeFormatOptions): {
+        sourceRenderer: SourceRenderer;
+        sourceFactory: PersistentSourceRegistry;
+        sourceReplacerFactory: SourceReplacerFactory;
+    };
+    protected setupTime(context: RR0ContextImpl): {
+        timeFiles: string[];
+        timeElementFactory: TimeElementFactory;
+        timeReplacer: TimeReplacer;
+    };
+    protected peopleSetup(context: RR0ContextImpl, peopleRenderer: PeopleHtmlRenderer, copies: string[]): Promise<{
+        peopleService: PeopleService;
+        peopleSteps: import("./people/PeopleDirectoryStep.js").PeopleDirectoryStep[];
+        copies: string[];
+    }>;
+    private setupNotes;
+    private setupCases;
 }

package/dist/{RR0Build.js → CMSGenerator.js}

@@ -1,14 +1,13 @@
 import path from "path";
 import fs from "fs";
-import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeRenderer, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
-import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/index.js";
-import { PlaceReplacerFactory } from "./place/index.js";
+import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeRenderer, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time/index.js";
+import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/crypto/ufo/enquete/dossier/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 { ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiIncludeReplaceCommand } from "ssg-api";
-import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleReplacerFactory, WitnessReplacerFactory } from "./people";
-import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source";
+import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleReplacerFactory } from "./people/index.js";
+import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source/index.js";
 import { NoteFileCounter, NoteRenderer, NoteReplacer, NoteReplacerFactory } from "./note/index.js";
 import { AnchorReplaceCommand, CaseAnchorHandler, DataAnchorHandler } from "./anchor/index.js";
 import { MetaLinkReplaceCommand } from "./MetaLinkReplaceCommand.js";
@@ -17,17 +16,15 @@ import { ImageCommand } from "./ImageCommand.js";
 import { SearchIndexStep, SearchVisitor } from "./search/index.js";
 import { OpenGraphCommand } from "./OpenGraphCommand.js";
 import { BookContentVisitor, BookDirectoryStep } from "./book/index.js";
-import { IndexedReplacerFactory } from "./index/IndexedReplacerFactory.js";
-import { APIFactory, CodeReplacerFactory } from "./tech/index.js";
+import { APIFactory } from "./tech/index.js";
 import { RR0ContentStep } from "./RR0ContentStep.js";
-import { UnitReplaceCommand } from "./value/index.js";
-import { DefaultContentVisitor } from "./DefaultContentVisitor.js";
+import { DataContentVisitor } from "./DataContentVisitor.js";
 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 { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer";
-import { CountryService } from "./org/country/CountryService";
+import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer.js";
+import { CountryService } from "./org/country/CountryService.js";
 const outputFunc = async (context, outFile) => {
     try {
         if (context.file instanceof HtmlFileContents) {
@@ -41,7 +38,7 @@ const outputFunc = async (context, outFile) => {
         context.error(outFile.name, e);
     }
 };
-export class RR0Build {
+export class CMSGenerator {
     constructor(options) {
         this.options = options;
         this.config = {
@@ -49,10 +46,6 @@ export class RR0Build {
                 return path.join(options.outDir, context.file.name);
             }
         };
-        const timeContext = new TimeContext();
-        const context = this.context = new RR0ContextImpl(options.locale, timeContext, this.config);
-        context.setVar("mapsApiKey", options.googleMapsApiKey);
-        context.setVar("mail", options.mail);
         const eventFactory = new RR0EventFactory();
         const orgFactory = new CmsOrganizationFactory(eventFactory);
         const countryService = this.countryService = new CountryService(countries, "org", orgFactory, undefined);
@@ -65,7 +58,7 @@ export class RR0Build {
         const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
         const timeOptions = options.timeOptions;
         const timeUrlBuilder = this.timeUrlBuilder = new TimeUrlBuilder(timeOptions);
-        const sightingFactory = new EventDataFactory(eventFactory, "sighting", ["index"]);
+        const sightingFactory = new EventDataFactory(eventFactory, ["sighting"], ["index"]);
         const caseFactory = this.caseFactory = new CaseFactory(eventFactory);
         const peopleFactory = this.peopleFactory = new PeopleFactory(eventFactory);
         const apiFactory = new APIFactory(eventFactory);
@@ -78,76 +71,37 @@ export class RR0Build {
         });
         this.timeRenderer = new TimeRenderer(timeUrlBuilder, timeTextBuilder);
         this.timeService = new TimeService(dataService, timeOptions);
+        this.http = new HttpSource();
     }
-    async run(args) {
-        const context = this.context;
-        const timeFiles = this.options.timeOptions.files;
-        context.setVar("timeFilesCount", timeFiles.length);
-        const timeRenderer = this.timeRenderer;
-        const timeElementFactory = new TimeElementFactory(timeRenderer);
-        const timeReplacer = new TimeReplacer(timeElementFactory);
-        const caseFiles = await this.caseFactory.getFiles();
-        let dataService = this.dataService;
-        const caseService = new CaseService(dataService, this.caseFactory, timeElementFactory, caseFiles);
-        const peopleFiles = await this.peopleFactory.getFiles();
-        const peopleService = new PeopleService(dataService, this.peopleFactory, { files: peopleFiles, rootDir: "people" });
-        const peopleList = await peopleService.getAll();
-        context.setVar("peopleFilesCount", peopleList.length);
-        const bookMeta = new Map();
-        const bookLinks = new Map();
+    async generate(args) {
+        const timeContext = new TimeContext();
+        const context = new RR0ContextImpl(this.options.locale, timeContext, this.config, undefined, undefined, undefined, this);
+        context.setVar("mapsApiKey", this.options.googleMapsApiKey);
+        context.setVar("mail", this.options.mail);
         const config = this.config;
-        const ufoCaseDirectoryFile = this.options.ufoCaseDirectoryFile;
-        const ufoCasesExclusions = this.options.ufoCasesExclusions;
-        const ufoCasesStep = new CaseDirectoryStep(caseService, caseService.files, ufoCasesExclusions, ufoCaseDirectoryFile, outputFunc, config);
-        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];
-        }
-        const peopleSteps = await peopleDirectoryFactory.create(directoryOptions);
-        // Publish case.json files so that vraiufo.com will find them
         const copies = this.options.copies;
-        const ufoCasesRootDirs = ufoCasesStep.config.rootDirs;
-        copies.push(...ufoCasesRootDirs.map(dir => path.join(dir, "case.json")));
         const outDir = this.options.outDir;
-        await writeFile(path.join(outDir, "casesDirs.json"), JSON.stringify(ufoCasesRootDirs), "utf-8");
-        const dirsContainingPeopleJson = peopleSteps.reduce((rootDirs, peopleStep) => {
-            rootDirs.push(...peopleStep.config.rootDirs);
-            return rootDirs;
-        }, []);
-        copies.push(...dirsContainingPeopleJson.map(dir => path.join(dir, "people.json")));
-        await writeFile(path.join(outDir, "peopleDirs.json"), JSON.stringify(peopleList.map(people => people.dirName)), "utf-8");
+        const force = args.force === "true";
+        const ssg = new Ssg(config);
+        const dataService = this.dataService;
+        const timeService = this.timeService;
+        const timeRenderer = this.timeRenderer;
+        const timeFormat = this.options.timeFormat;
+        const { timeFiles, timeElementFactory, timeReplacer } = this.setupTime(context);
+        const { caseService, ufoCasesStep } = await this.setupCases(timeElementFactory);
+        const peopleRenderer = new PeopleHtmlRenderer();
+        const { peopleService, peopleSteps } = await this.peopleSetup(context, peopleRenderer, this.options.copies);
         const timeTextBuilder = this.timeTextBuilder;
         const searchVisitor = new SearchVisitor({ notIndexedUrls: ["404.html", "Referencement.html"], indexWords: false }, timeTextBuilder);
-        const sourceRenderer = new SourceRenderer(timeTextBuilder);
-        const http = new HttpSource();
-        const baseUrl = this.options.siteBaseUrl;
-        const timeFormat = this.options.timeFormat;
-        const sourceRegistryFileName = this.options.sourceRegistryFileName;
-        const timeService = this.timeService;
-        const sourceFactory = new PersistentSourceRegistry(dataService, http, baseUrl, sourceRegistryFileName, timeFormat, timeService);
-        const noteCounter = new NoteFileCounter();
-        const noteRenderer = new NoteRenderer(noteCounter);
+        const { sourceRenderer, sourceFactory, sourceReplacerFactory } = this.setupSources(timeTextBuilder, timeFormat);
+        const { noteRenderer, noteReplacerFactory } = this.setupNotes();
         const caseRenderer = new CaseSummaryRenderer(noteRenderer, sourceFactory, sourceRenderer, timeElementFactory);
         const mappings = this.options.mappings || [];
         mappings.forEach(mapping => mapping.init(this));
         const timeUrlBuilder = this.timeUrlBuilder;
         const databaseAggregationCommand = new DomReplaceCommand(".contents ul", new ChronologyReplacerFactory(timeUrlBuilder, mappings, caseRenderer));
-        const timeDefaultHandler = (context) => {
-            let title;
-            title = timeService.titleFromFile(context, context.file.name, timeTextBuilder);
-            return title;
-        };
-        const sourceCounter = new SourceFileCounter();
-        const sourceReplacer = new SourceReplacer(sourceRenderer, sourceFactory, sourceCounter);
-        const sourceReplacerFactory = new SourceReplacerFactory(sourceReplacer);
-        const noteReplacer = new NoteReplacer(noteRenderer);
-        const noteReplacerFactory = new NoteReplacerFactory(noteReplacer);
         const eventReplacer = new EventReplacer(caseRenderer, dataService);
-        const ssg = new Ssg(config);
         const getOutputPath = (context) => path.join(outDir, context.file.name);
-        const force = args.force === "true";
         const toProcess = new Set(this.options.directoryPages);
         const csvTransformer = new class {
             transform(context, file) {
@@ -162,11 +116,9 @@ export class RR0Build {
             }
         }();
         const htAccessToNetlifyConfig = {
-            replacements: [new HtAccessToNetlifyConfigReplaceCommand(baseUrl)],
+            replacements: [new HtAccessToNetlifyConfigReplaceCommand(this.options.siteBaseUrl)],
             roots: [".htaccess"],
-            getOutputPath(_context) {
-                return path.join(outDir, "netlify.toml");
-            }
+            getOutputPath: (_context) => path.join(outDir, "netlify.toml")
         };
         const contentRoots = this.options.contentRoots;
         const contentStepOptions = {
@@ -187,27 +139,20 @@ export class RR0Build {
         ssg.add(ufoCasesStep);
         ssg.add(...peopleSteps);
         if (contentRoots) {
-            const contentVisitor = new DefaultContentVisitor(dataService, caseRenderer, timeElementFactory);
-            const contentVisitors = [contentVisitor, searchVisitor];
-            if (args.books) {
-                contentVisitors.push(new BookContentVisitor(bookMeta, bookLinks));
-            }
+            const dataContentVisitor = new DataContentVisitor(dataService, caseRenderer, timeElementFactory);
+            const contentVisitors = [dataContentVisitor, searchVisitor];
+            const timeDefaultHandler = (context) => this.timeService.titleFromFile(context, context.file.name, this.timeTextBuilder);
             const pageReplaceCommands = [
-                ...this.options.contentReplacers,
                 new SsiTitleReplaceCommand([timeDefaultHandler]),
-                new AuthorReplaceCommand(timeRenderer)
+                new AuthorReplaceCommand(timeRenderer),
+                ...this.options.contentReplacers
             ];
             const contentsReplaceCommand = [
                 new ClassDomReplaceCommand(new EventReplacerFactory(eventReplacer), "event"),
                 new ClassDomReplaceCommand(sourceReplacerFactory, "source"),
                 new DomReplaceCommand("time", new TimeReplacerFactory(timeReplacer, timeUrlBuilder)),
-                new DomReplaceCommand("code", new CodeReplacerFactory()),
                 new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService, peopleRenderer), "people"),
-                new ClassDomReplaceCommand(new PlaceReplacerFactory(), "place"),
-                new ClassDomReplaceCommand(new WitnessReplacerFactory(), "temoin", "temoin1", "temoin2", "temoin3"),
                 new ClassDomReplaceCommand(noteReplacerFactory, "note"),
-                new ClassDomReplaceCommand(new IndexedReplacerFactory(), "indexed"),
-                new UnitReplaceCommand(),
                 new MetaLinkReplaceCommand(new TimeLinkDefaultHandler(timeService, timeUrlBuilder, timeTextBuilder)),
                 databaseAggregationCommand
             ];
@@ -215,24 +160,27 @@ export class RR0Build {
                 ...pageReplaceCommands,
                 ...contentsReplaceCommand,
                 new OutlineReplaceCommand(),
-                new AnchorReplaceCommand(baseUrl, [new CaseAnchorHandler(caseService, timeTextBuilder), new DataAnchorHandler(dataService)]),
+                new AnchorReplaceCommand(this.options.siteBaseUrl, [new CaseAnchorHandler(caseService, timeTextBuilder), new DataAnchorHandler(dataService)]),
                 new ImageCommand(outDir, 275, 500),
-                new OpenGraphCommand(outDir, timeFiles, baseUrl, timeService, timeTextBuilder)
+                new OpenGraphCommand(outDir, timeFiles, this.options.siteBaseUrl, timeService, timeTextBuilder)
             ];
             ssg.add(new RR0ContentStep({
                 contentConfigs: [{ roots: contentRoots, replacements: contentReplacements, getOutputPath }],
                 outputFunc, fileVisitors: [], contentVisitors, force, name: "contents replacements", toProcess
             }, timeService));
-        }
-        if (args.books) {
-            ssg.add(await BookDirectoryStep.create(outputFunc, config, bookMeta, bookLinks));
+            if (args.books) {
+                const bookMeta = new Map();
+                const bookLinks = new Map();
+                contentVisitors.push(new BookContentVisitor(bookMeta, bookLinks));
+                ssg.add(await BookDirectoryStep.create(outputFunc, config, bookMeta, bookLinks));
+            }
         }
         const reindex = args.reindex;
         if (reindex === null || reindex === void 0 ? void 0 : reindex.includes("search")) {
             ssg.add(new SearchIndexStep("search/index.json", searchVisitor));
         }
         if (reindex === null || reindex === void 0 ? void 0 : reindex.includes("sources")) {
-            ssg.add(new SourceIndexStep(sourceRegistryFileName, sourceFactory));
+            ssg.add(new SourceIndexStep(this.options.sourceRegistryFileName, sourceFactory));
         }
         if (copies) {
             const copyConfig = {
@@ -258,4 +206,57 @@ export class RR0Build {
             console.timeEnd("ssg");
         }
     }
+    setupSources(timeTextBuilder, timeFormat) {
+        const sourceRenderer = new SourceRenderer(timeTextBuilder);
+        const sourceFactory = new PersistentSourceRegistry(this.dataService, this.http, this.options.siteBaseUrl, this.options.sourceRegistryFileName, timeFormat, this.timeService);
+        const sourceCounter = new SourceFileCounter();
+        const sourceReplacer = new SourceReplacer(sourceRenderer, sourceFactory, sourceCounter);
+        const sourceReplacerFactory = new SourceReplacerFactory(sourceReplacer);
+        return { sourceRenderer, sourceFactory, sourceReplacerFactory };
+    }
+    setupTime(context) {
+        const timeFiles = this.options.timeOptions.files;
+        context.setVar("timeFilesCount", timeFiles.length);
+        const timeElementFactory = new TimeElementFactory(this.timeRenderer);
+        const timeReplacer = new TimeReplacer(timeElementFactory);
+        return { timeFiles, timeElementFactory, timeReplacer };
+    }
+    async peopleSetup(context, peopleRenderer, copies) {
+        const peopleFiles = await this.peopleFactory.getFiles();
+        const peopleService = new PeopleService(this.dataService, this.peopleFactory, { files: peopleFiles, rootDir: "people" });
+        const peopleList = await peopleService.getAll();
+        context.setVar("peopleFilesCount", peopleList.length);
+        const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, this.config, peopleService, peopleRenderer, this.options.directoryExcluded);
+        const directoryOptions = this.options.directoryOptions;
+        for (const directoryOption in directoryOptions) {
+            directoryOptions[directoryOption] = directoryOptions[directoryOption];
+        }
+        const peopleSteps = await peopleDirectoryFactory.create(directoryOptions);
+        const dirsContainingPeopleJson = peopleSteps.reduce((rootDirs, peopleStep) => {
+            rootDirs.push(...peopleStep.config.rootDirs);
+            return rootDirs;
+        }, []);
+        copies.push(...dirsContainingPeopleJson.map(dir => path.join(dir, "people.json")));
+        await writeFile(path.join(this.options.outDir, "peopleDirs.json"), JSON.stringify(peopleList.map(people => people.dirName)), "utf-8");
+        return { peopleService, peopleSteps, copies };
+    }
+    setupNotes() {
+        const noteCounter = new NoteFileCounter();
+        const noteRenderer = new NoteRenderer(noteCounter);
+        const noteReplacer = new NoteReplacer(noteRenderer);
+        const noteReplacerFactory = new NoteReplacerFactory(noteReplacer);
+        return { noteRenderer, noteReplacerFactory };
+    }
+    async setupCases(timeElementFactory) {
+        const caseFiles = await this.caseFactory.getFiles();
+        const caseService = new CaseService(this.dataService, this.caseFactory, timeElementFactory, caseFiles);
+        const ufoCaseDirectoryFile = this.options.ufoCaseDirectoryFile;
+        const ufoCasesExclusions = this.options.ufoCasesExclusions;
+        const ufoCasesStep = new CaseDirectoryStep(caseService, caseService.files, ufoCasesExclusions, ufoCaseDirectoryFile, outputFunc, this.config);
+        // Publish case.json files so that vraiufo.com will find them
+        const ufoCasesRootDirs = ufoCasesStep.config.rootDirs;
+        this.options.copies.push(...ufoCasesRootDirs.map(dir => path.join(dir, "case.json")));
+        await writeFile(path.join(this.options.outDir, "casesDirs.json"), JSON.stringify(ufoCasesRootDirs), "utf-8");
+        return { caseService, ufoCasesStep };
+    }
 }

package/dist/CMSGenerator.test.d.ts

@@ -0,0 +1 @@
+export declare function getTimeFiles(): Promise<string[]>;

package/dist/{RR0Build.test.js → CMSGenerator.test.js}

@@ -1,15 +1,29 @@
 import { glob } from "glob";
 import { describe } from "@javarome/testscript";
-import { RR0Build } from "./RR0Build.js";
+import { CMSGenerator } from "./CMSGenerator.js";
 import { BaseOvniFranceRR0Mapping, FuforaRR0Mapping, NuforcRR0Mapping, RR0Mapping, SceauRR0Mapping, UrecatRR0Mapping } from "./time/index.js";
-import { testFilePath } from "./test";
+import { WitnessReplacerFactory } from "./people/index.js";
 import * as process from "node:process";
-import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping";
-import { BaseReplaceCommand } from "./BaseReplaceCommand";
-import { LanguageReplaceCommand } from "./lang";
-import { AngularExpressionReplaceCommand, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
-import { rr0DefaultCopyright } from "./RR0DefaultCopyright";
-import { DescriptionReplaceCommand } from "./DescriptionReplaceCommand";
+import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.js";
+import { BaseReplaceCommand } from "./BaseReplaceCommand.js";
+import { LanguageReplaceCommand } from "./lang/LanguageReplaceCommand.js";
+import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, DomReplaceCommand, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
+import { rr0DefaultCopyright } from "./RR0DefaultCopyright.js";
+import { DescriptionReplaceCommand } from "./DescriptionReplaceCommand.js";
+import { CodeReplacerFactory } from "./tech/index.js";
+import { PlaceReplacerFactory } from "./place/index.js";
+import { IndexedReplacerFactory, UnitReplaceCommand } from "./index.js";
+import { rr0TestUtil } from "./test/index.js";
+export async function getTimeFiles() {
+    const minusYearFiles = await glob(rr0TestUtil.filePath("time/-?/?/?/?/index.html"));
+    const year1Files = await glob(rr0TestUtil.filePath("time/?/index.html"));
+    const year2Files = await glob(rr0TestUtil.filePath("time/?/?/index.html"));
+    const year3Files = await glob(rr0TestUtil.filePath("time/?/?/?/index.html"));
+    const year4Files = await glob(rr0TestUtil.filePath("time/?/?/?/?/index.html"));
+    const monthFiles = await glob(rr0TestUtil.filePath("time/?/?/?/?/??/index.html"));
+    const dayFiles = await glob(rr0TestUtil.filePath("time/?/?/?/?/??/??/index.html"));
+    return year1Files.concat(year2Files).concat(year3Files).concat(year4Files).concat(minusYearFiles).concat(monthFiles).concat(dayFiles).sort();
+}
 describe("Build", () => {
     console.time("ssg");
     const args = {
@@ -35,7 +49,7 @@ describe("Build", () => {
             "tech/**/*.html",
             "udb/*.html",
             "js/**/*.html"
-        ].map(testFilePath);
+        ].map(rr0TestUtil.filePath);
     const copiesArg = args.copies;
     const copies = copiesArg ? copiesArg : [
         "favicon.ico", "manifest.json", "opensearch.xml", "apple-touch-icon.png", "apple-touch-icon_400x400.png", "screenshot1.jpg",
@@ -51,7 +65,7 @@ describe("Build", () => {
         "time/DualRangeComponent.mjs",
         "index/index.js", "lang/form.js", "lang/form.css", "lang/speech.js", "lang/speech.css",
         "croyance/divin/theisme/mono/livre/islam/coran/index.js"
-    ].map(testFilePath);
+    ].map(path => rr0TestUtil.filePath(path));
     const outDir = "out";
     const googleMapsApiKey = process.env.GOOGLE_MAPS_API_KEY;
     if (!googleMapsApiKey) {
@@ -65,39 +79,29 @@ describe("Build", () => {
         hour: "2-digit",
         minute: "2-digit"
     };
-    async function getTimeFiles() {
-        const minusYearFiles = await glob(testFilePath("time/-?/?/?/?/index.html"));
-        const year1Files = await glob(testFilePath("time/?/index.html"));
-        const year2Files = await glob(testFilePath("time/?/?/index.html"));
-        const year3Files = await glob(testFilePath("time/?/?/?/index.html"));
-        const year4Files = await glob(testFilePath("time/?/?/?/?/index.html"));
-        const monthFiles = await glob(testFilePath("time/?/?/?/?/??/index.html"));
-        const dayFiles = await glob(testFilePath("time/?/?/?/?/??/??/index.html"));
-        return year1Files.concat(year2Files).concat(year3Files).concat(year4Files).concat(minusYearFiles).concat(monthFiles).concat(dayFiles).sort();
-    }
     const directoryPages = [
         "people/index.html", "people/witness/index.html", "people/militaires.html", "people/scientifiques.html",
         "people/astronomes.html", "people/politicians.html", "people/dirigeants.html", "people/pilotes.html",
         "people/contactes.html", "people/ufologues.html", "tech/info/Personnes.html", "people/Contributeurs.html"
-    ].map(testFilePath);
+    ].map(path => rr0TestUtil.filePath(path));
     getTimeFiles().then(async (timeFiles) => {
         const directoryOptions = {
-            root: testFilePath("people/index.html"),
-            scientists: testFilePath("people/scientifiques.html"),
-            ufologists: testFilePath("people/ufologues.html"),
-            ufoWitnesses: testFilePath("people/witness/index.html"),
-            astronomers: testFilePath("people/astronomes.html"),
-            contactees: testFilePath("people/contactes.html"),
-            pilots: testFilePath("people/pilotes.html"),
-            military: testFilePath("people/militaires.html"),
-            softwareEngineers: testFilePath("tech/info/Personnes.html"),
-            politicians: testFilePath("people/politicians.html"),
-            rulers: testFilePath("people/dirigeants.html")
+            root: rr0TestUtil.filePath("people/index.html"),
+            scientists: rr0TestUtil.filePath("people/scientifiques.html"),
+            ufologists: rr0TestUtil.filePath("people/ufologues.html"),
+            ufoWitnesses: rr0TestUtil.filePath("people/witness/index.html"),
+            astronomers: rr0TestUtil.filePath("people/astronomes.html"),
+            contactees: rr0TestUtil.filePath("people/contactes.html"),
+            pilots: rr0TestUtil.filePath("people/pilotes.html"),
+            military: rr0TestUtil.filePath("people/militaires.html"),
+            softwareEngineers: rr0TestUtil.filePath("tech/info/Personnes.html"),
+            politicians: rr0TestUtil.filePath("people/politicians.html"),
+            rulers: rr0TestUtil.filePath("people/dirigeants.html")
         };
-        const sourceRegistryFileName = testFilePath("source/index.json");
+        const sourceRegistryFileName = rr0TestUtil.filePath("source/index.json");
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
-        const timeOptions = { rootDir: testFilePath("time"), files: timeFiles };
+        const timeOptions = { rootDir: rr0TestUtil.filePath("time"), files: timeFiles };
         // const actions: ChronologyReplacerActions = {read: ["backup", "fetch"], write: ["backup", "pages"]}
         // const actions: ChronologyReplacerActions = {read: [], write: ["backup"]}
         const actions = { read: ["fetch"], write: ["backup"] };
@@ -108,33 +112,41 @@ describe("Build", () => {
         const nuforcRR0Mapping = new NuforcRR0Mapping(actions);
         const urecatRR0Mapping = new UrecatRR0Mapping(actions);
         const sceauRR0Mapping = new SceauRR0Mapping(actions);
-        const mappings = [rr0Mapping,
+        const mappings = [rr0Mapping
             /*      geipanRR0Mapping,
                   baseOvniFranceRR0Mapping, fuforaRR0Mapping, nuforcRR0Mapping, urecatRR0Mapping,
                   sceauRR0Mapping*/
         ];
-        const build = new RR0Build({
+        const pageReplacers = [
+            new BaseReplaceCommand("/"),
+            new LanguageReplaceCommand(),
+            new SsiEchoVarReplaceCommand("copyright", [rr0DefaultCopyright]),
+            new StringEchoVarReplaceCommand(),
+            new AngularExpressionReplaceCommand(),
+            new SsiIfReplaceCommand(),
+            new SsiSetVarReplaceCommand("title", (_match, ...args) => `<title>${args[0]}</title>`),
+            new SsiSetVarReplaceCommand("url", (_match, ...args) => `<meta name="url" content="${args[0]}"/>`),
+            new SsiLastModifiedReplaceCommand(timeFormat),
+            new DescriptionReplaceCommand("UFO data for french-reading people", "abstract")
+        ];
+        const contentsReplacers = [
+            new DomReplaceCommand("code", new CodeReplacerFactory()),
+            new ClassDomReplaceCommand(new PlaceReplacerFactory(), "place"),
+            new ClassDomReplaceCommand(new WitnessReplacerFactory(), "temoin", "temoin1", "temoin2", "temoin3"),
+            new ClassDomReplaceCommand(new IndexedReplacerFactory(), "indexed"),
+            new UnitReplaceCommand()
+        ];
+        const generator = new CMSGenerator({
             contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
             siteBaseUrl, timeFormat, directoryPages,
-            ufoCaseDirectoryFile: testFilePath("science/crypto/ufo/enquete/dossier/index.html"),
-            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(testFilePath),
+            ufoCaseDirectoryFile: rr0TestUtil.filePath("science/crypto/ufo/enquete/dossier/index.html"),
+            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(path => rr0TestUtil.filePath(path)),
             sourceRegistryFileName,
-            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(testFilePath),
+            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(path => rr0TestUtil.filePath(path)),
             directoryOptions,
             mappings,
-            contentReplacers: [
-                new BaseReplaceCommand("/"),
-                new LanguageReplaceCommand(),
-                new SsiEchoVarReplaceCommand("copyright", [rr0DefaultCopyright]),
-                new StringEchoVarReplaceCommand(),
-                new AngularExpressionReplaceCommand(),
-                new SsiIfReplaceCommand(),
-                new SsiSetVarReplaceCommand("title", (_match, ...args) => `<title>${args[0]}</title>`),
-                new SsiSetVarReplaceCommand("url", (_match, ...args) => `<meta name="url" content="${args[0]}"/>`),
-                new SsiLastModifiedReplaceCommand(timeFormat),
-                new DescriptionReplaceCommand("UFO data for french-reading people", "abstract")
-            ]
+            contentReplacers: [...pageReplacers, ...contentsReplacers]
         });
-        await build.run(args);
+        await generator.generate(args);
     });
 });

package/dist/{DefaultContentVisitor.d.ts → DataContentVisitor.d.ts}

@@ -3,7 +3,10 @@ import { ContentVisitor } from "./RR0ContentStep.js";
 import { HtmlRR0Context } from "./RR0Context.js";
 import { EventRenderer } from "./time/EventRenderer.js";
 import { AllDataService, RR0Data, RR0Event } from "@rr0/data";
-export declare class DefaultContentVisitor implements ContentVisitor {
+/**
+ * Insert content in context file, according to data found in .json files aside of it.
+ */
+export declare class DataContentVisitor implements ContentVisitor {
     protected service: AllDataService;
     protected eventRenderer: EventRenderer<RR0Event>;
     protected timeElementFactory: TimeElementFactory;

package/dist/{DefaultContentVisitor.js → DataContentVisitor.js}

@@ -1,6 +1,9 @@
 import path from "path";
 import assert from "assert";
-export class DefaultContentVisitor {
+/**
+ * Insert content in context file, according to data found in .json files aside of it.
+ */
+export class DataContentVisitor {
     constructor(service, eventRenderer, timeElementFactory) {
         this.service = service;
         this.eventRenderer = eventRenderer;

package/dist/DescriptionReplaceCommand.d.ts

@@ -1,5 +1,5 @@
 import { HtmlRR0Context } from "./RR0Context.js";
-import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
+import { ReplaceCommand } from "ssg-api";
 /**
  * Adds an "abstract" HTML paragraph from a <meta name="description">, if any.
  */

package/dist/ImageCommand.js

@@ -1,7 +1,7 @@
 import { DomReplaceCommand } from "ssg-api";
 import * as path from "path";
 import * as fs from "fs";
-import sizeOf from "image-size";
+import { imageSizeFromFile } from "image-size/fromFile";
 /**
  * Register images (`<img>` tags) required in an HTML file.
  */
@@ -45,7 +45,7 @@ export class ImageCommand extends DomReplaceCommand {
                     let imgPath = isExternal ? src : isAbsolute ? path.join(".", src) : path.join(path.dirname(context.file.name), src);
                     imgEl.loading = "lazy";
                     if (!isExternal && !imgEl.width && !imgEl.height) {
-                        const dimensions = sizeOf(imgPath);
+                        const dimensions = await imageSizeFromFile(imgPath);
                         let width = dimensions.width;
                         let height = dimensions.height;
                         if (width > this.maxWidth) {

package/dist/OpenGraphCommand.d.ts

@@ -1,4 +1,4 @@
-import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
+import { ReplaceCommand } from "ssg-api";
 import { HtmlRR0Context } from "./RR0Context.js";
 import { Canvas, CanvasRenderingContext2D } from "canvas";
 import { TimeService, TimeTextBuilder } from "./time/index.js";

package/dist/OpenGraphCommand.js

@@ -49,7 +49,7 @@ export class OpenGraphCommand {
             timeStr = "Chronologie";
         }
         else {
-            const timeContext = this.timeService.gSetTimeFromPath(context, fileName);
+            const timeContext = this.timeService.setContextFromFile(context, fileName);
             if (timeContext) {
                 context.time.setYear(timeContext.getYear());
                 context.time.setMonth(timeContext.getMonth());