@rr0/cms 0.3.14 → 0.3.16

package/dist/OpenGraphCommand.d.ts

@@ -1,7 +1,7 @@
 import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
 import { HtmlRR0Context } from "./RR0Context.js";
 import { Canvas, CanvasRenderingContext2D } from "canvas";
-import { TimeService } from "./time/index.js";
+import { TimeService, TimeTextBuilder } from "./time/index.js";
 /**
  * Create a preview image for each page sharing.
  */
@@ -10,10 +10,11 @@ export declare class OpenGraphCommand implements ReplaceCommand<HtmlRR0Context>
     protected timeFiles: string[];
     protected baseUrl: string;
     protected timeService: TimeService;
+    readonly timeTextBuilder: TimeTextBuilder;
     protected width: number;
     protected height: number;
     protected num: number;
-    constructor(outDir: string, timeFiles: string[], baseUrl: string, timeService: TimeService, width?: number, height?: number);
+    constructor(outDir: string, timeFiles: string[], baseUrl: string, timeService: TimeService, timeTextBuilder: TimeTextBuilder, width?: number, height?: number);
     execute(context: HtmlRR0Context): Promise<void>;
     getInfoStr(context: HtmlRR0Context): string;
     contentStepEnd(): Promise<void>;

package/dist/OpenGraphCommand.js

@@ -6,11 +6,12 @@ import assert from "assert";
  * Create a preview image for each page sharing.
  */
 export class OpenGraphCommand {
-    constructor(outDir, timeFiles, baseUrl, timeService, width = 1200, height = 600) {
+    constructor(outDir, timeFiles, baseUrl, timeService, timeTextBuilder, width = 1200, height = 600) {
         this.outDir = outDir;
         this.timeFiles = timeFiles;
         this.baseUrl = baseUrl;
         this.timeService = timeService;
+        this.timeTextBuilder = timeTextBuilder;
         this.width = width;
         this.height = height;
         this.num = 0;
@@ -55,7 +56,7 @@ export class OpenGraphCommand {
                 context.time.setDayOfMonth(timeContext.getDayOfMonth());
                 context.time.setHour(undefined);
                 context.time.setMinutes(undefined);
-                timeStr = this.timeService.textBuilder.build(context);
+                timeStr = this.timeTextBuilder.build(context);
             }
         }
         const copyrightStr = context.file.meta.copyright || "RR0.org";

package/dist/OpenGraphCommand.test.js

@@ -6,7 +6,7 @@ describe("OpenGraphCommand", () => {
     test("time page", () => {
         const timeFile = rr0TestUtil.time.filePath("0/0/6/5/index.html");
         const context = rr0TestUtil.newHtmlContext(timeFile, "");
-        const command = new OpenGraphCommand(outDir, [context.file.name], "https://rr0.org", rr0TestUtil.time.getService());
+        const command = new OpenGraphCommand(outDir, [context.file.name], "https://rr0.org", rr0TestUtil.time.getService(), rr0TestUtil.time.timeTextBuilder);
         expect(command.getInfoStr(context)).toBe("Chronologie, RR0.org");
     });
 });

package/dist/RR0Build.d.ts

@@ -1,13 +1,15 @@
-import { RR0CaseMapping, TimeService, TimeServiceOptions, TimeTextBuilder } from "./time";
+import { RR0CaseMapping, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
 import { CaseFactory } from "./science/index.js";
 import { CityService, DepartmentService, OrganizationService } from "./org/index.js";
-import { RR0ContextImpl } from "./RR0Context.js";
+import { HtmlRR0Context, 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";
+import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace";
+import { TimeOptions } from "./time/TimeOptions";
 export interface RR0BuildOptions {
     contentRoots: string[];
     copies: string[];
@@ -15,7 +17,7 @@ export interface RR0BuildOptions {
     locale: string;
     googleMapsApiKey: string;
     mail: string;
-    timeOptions: TimeServiceOptions;
+    timeOptions: TimeOptions;
     siteBaseUrl: string;
     timeFormat: Intl.DateTimeFormatOptions;
     directoryPages: string[];
@@ -25,6 +27,7 @@ export interface RR0BuildOptions {
     directoryExcluded: string[];
     directoryOptions: PeopleDirectoryStepOptions;
     mappings: RR0CaseMapping<any>[];
+    contentReplacers: ReplaceCommand<HtmlRR0Context>[];
 }
 export interface RR0BuildArgs {
     /**
@@ -59,14 +62,16 @@ export declare class RR0Build implements BuildContext {
     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;
+    readonly timeTextBuilder: TimeTextBuilder;
+    readonly timeService: TimeService;
+    readonly timeRenderer: TimeRenderer;
+    readonly timeUrlBuilder: TimeUrlBuilder;
     constructor(options: RR0BuildOptions);
     run(args: RR0BuildArgs): Promise<void>;
 }

package/dist/RR0Build.js

@@ -1,13 +1,12 @@
 import path from "path";
 import fs from "fs";
-import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
+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 { 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";
-import { LanguageReplaceCommand } from "./lang/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 { NoteFileCounter, NoteRenderer, NoteReplacer, NoteReplacerFactory } from "./note/index.js";
@@ -16,16 +15,13 @@ import { MetaLinkReplaceCommand } from "./MetaLinkReplaceCommand.js";
 import { OutlineReplaceCommand } from "./outline/index.js";
 import { ImageCommand } from "./ImageCommand.js";
 import { SearchIndexStep, SearchVisitor } from "./search/index.js";
-import { BaseReplaceCommand } from "./BaseReplaceCommand.js";
 import { OpenGraphCommand } from "./OpenGraphCommand.js";
-import { DescriptionReplaceCommand } from "./DescriptionReplaceCommand.js";
 import { BookContentVisitor, BookDirectoryStep } from "./book/index.js";
 import { IndexedReplacerFactory } from "./index/IndexedReplacerFactory.js";
 import { APIFactory, CodeReplacerFactory } from "./tech/index.js";
 import { RR0ContentStep } from "./RR0ContentStep.js";
 import { UnitReplaceCommand } from "./value/index.js";
 import { DefaultContentVisitor } from "./DefaultContentVisitor.js";
-import { rr0DefaultCopyright } from "./RR0DefaultCopyright.js";
 import { TimeContext } from "@rr0/time";
 import { writeFile } from "@javarome/fileutil";
 import { AllDataService, EventDataFactory, PeopleFactory, PeopleService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
@@ -68,8 +64,7 @@ export class RR0Build {
         this.cityService = cityService;
         const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
         const timeOptions = options.timeOptions;
-        const timeRoot = timeOptions.root;
-        const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeRoot });
+        const timeUrlBuilder = this.timeUrlBuilder = new TimeUrlBuilder(timeOptions);
         const sightingFactory = new EventDataFactory(eventFactory, "sighting", ["index"]);
         const caseFactory = this.caseFactory = new CaseFactory(eventFactory);
         const peopleFactory = this.peopleFactory = new PeopleFactory(eventFactory);
@@ -81,14 +76,15 @@ export class RR0Build {
         dataService.getFromDir("", ["people", "case"]).then(data => {
             console.debug(data);
         });
-        this.timeService = new TimeService(dataService, timeTextBuilder, timeUrlBuilder, timeOptions);
+        this.timeRenderer = new TimeRenderer(timeUrlBuilder, timeTextBuilder);
+        this.timeService = new TimeService(dataService, timeOptions);
     }
     async run(args) {
         const context = this.context;
         const timeFiles = this.options.timeOptions.files;
         context.setVar("timeFilesCount", timeFiles.length);
-        const timeService = this.timeService;
-        const timeElementFactory = new TimeElementFactory(timeService.renderer);
+        const timeRenderer = this.timeRenderer;
+        const timeElementFactory = new TimeElementFactory(timeRenderer);
         const timeReplacer = new TimeReplacer(timeElementFactory);
         const caseFiles = await this.caseFactory.getFiles();
         let dataService = this.dataService;
@@ -112,9 +108,10 @@ export class RR0Build {
         const peopleSteps = await peopleDirectoryFactory.create(directoryOptions);
         // Publish case.json files so that vraiufo.com will find them
         const copies = this.options.copies;
-        copies.push(...(ufoCasesStep.config.rootDirs).map(dir => path.join(dir, "case.json")));
+        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(ufoCasesStep.config.rootDirs), "utf-8");
+        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;
@@ -128,52 +125,26 @@ export class RR0Build {
         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 caseRenderer = new CaseSummaryRenderer(noteRenderer, sourceFactory, sourceRenderer, timeElementFactory);
-        const mappings = this.options.mappings || [new RR0Mapping({ read: ["fetch"], write: ["backup"] })];
+        const mappings = this.options.mappings || [];
         mappings.forEach(mapping => mapping.init(this));
-        const databaseAggregationCommand = new DomReplaceCommand(".contents ul", new ChronologyReplacerFactory(timeService, mappings, caseRenderer));
+        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 pageReplaceCommands = [
-            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 SsiTitleReplaceCommand([timeDefaultHandler]),
-            new DescriptionReplaceCommand("UFO data for french-reading people", "abstract"),
-            new AuthorReplaceCommand(timeService)
-        ];
         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 contentsReplaceCommand = [
-            new ClassDomReplaceCommand(new EventReplacerFactory(eventReplacer), "event"),
-            new ClassDomReplaceCommand(sourceReplacerFactory, "source"),
-            new DomReplaceCommand("time", new TimeReplacerFactory(timeReplacer)),
-            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, timeTextBuilder)),
-            databaseAggregationCommand
-        ];
         const ssg = new Ssg(config);
         const getOutputPath = (context) => path.join(outDir, context.file.name);
         const force = args.force === "true";
@@ -204,8 +175,7 @@ export class RR0Build {
                     replacements: [new class extends SsiIncludeReplaceCommand {
                             filePath(context, fileNameArg) {
                                 const dirName = path.dirname(context.file.name);
-                                return fileNameArg.startsWith("/") ?
-                                    path.join(process.cwd(), fileNameArg) : path.join(dirName, fileNameArg);
+                                return fileNameArg.startsWith("/") ? path.join(process.cwd(), fileNameArg) : path.join(dirName, fileNameArg);
                             }
                         }([csvTransformer])],
                     getOutputPath
@@ -222,13 +192,32 @@ export class RR0Build {
             if (args.books) {
                 contentVisitors.push(new BookContentVisitor(bookMeta, bookLinks));
             }
+            const pageReplaceCommands = [
+                ...this.options.contentReplacers,
+                new SsiTitleReplaceCommand([timeDefaultHandler]),
+                new AuthorReplaceCommand(timeRenderer)
+            ];
+            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
+            ];
             const contentReplacements = [
                 ...pageReplaceCommands,
                 ...contentsReplaceCommand,
                 new OutlineReplaceCommand(),
                 new AnchorReplaceCommand(baseUrl, [new CaseAnchorHandler(caseService, timeTextBuilder), new DataAnchorHandler(dataService)]),
                 new ImageCommand(outDir, 275, 500),
-                new OpenGraphCommand(outDir, timeFiles, baseUrl, timeService)
+                new OpenGraphCommand(outDir, timeFiles, baseUrl, timeService, timeTextBuilder)
             ];
             ssg.add(new RR0ContentStep({
                 contentConfigs: [{ roots: contentRoots, replacements: contentReplacements, getOutputPath }],

package/dist/RR0Build.test.js

@@ -5,6 +5,11 @@ import { BaseOvniFranceRR0Mapping, FuforaRR0Mapping, NuforcRR0Mapping, RR0Mappin
 import { testFilePath } from "./test";
 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";
 describe("Build", () => {
     console.time("ssg");
     const args = {
@@ -92,7 +97,7 @@ describe("Build", () => {
         const sourceRegistryFileName = testFilePath("source/index.json");
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
-        const timeOptions = { root: testFilePath("time"), files: timeFiles };
+        const timeOptions = { rootDir: 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"] };
@@ -116,7 +121,19 @@ describe("Build", () => {
             sourceRegistryFileName,
             directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(testFilePath),
             directoryOptions,
-            mappings
+            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")
+            ]
         });
         await build.run(args);
     });

package/dist/anchor/AnchorReplaceCommandTest.js

@@ -8,9 +8,8 @@ import path from "path";
 describe("AnchorReplaceCommand", () => {
     test("replace anchor tag", async () => {
         const dataService = rr0TestUtil.dataService;
-        const timeService = rr0TestUtil.time.getService();
         const timeTextBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
-        const timeRenderer = new TimeRenderer(timeService, timeTextBuilder);
+        const timeRenderer = new TimeRenderer(rr0TestUtil.time.urlBuilder, timeTextBuilder);
         const timeElementFactory = new TimeElementFactory(timeRenderer);
         const roswellUrl = "/src/science/crypto/ufo/enquete/dossier/Roswell";
         const caseFiles = [path.join(roswellUrl, "index.html")];

package/dist/book/BookService.test.js

@@ -20,10 +20,10 @@ const config = {
     }
 };
 const timeOptions = {
-    root: testFilePath("time"),
+    rootDir: testFilePath("time"),
     files: []
 };
-const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeOptions.root });
+const timeUrlBuilder = new TimeUrlBuilder(timeOptions);
 let files = [];
 const peopleService = new PeopleService(dataService, peopleFactory, { files, rootDir: testFilePath("people") });
 const books = new BookService(logger, dry, peopleService, timeUrlBuilder, config);

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

@@ -1,12 +1,12 @@
 import { RegexReplacer, SsiEchoVarReplaceCommand } from "ssg-api";
 import { HtmlRR0Context } from "../../RR0Context.js";
-import { TimeService } from "../../time/TimeService.js";
+import { TimeRenderer } from "../../time";
 /**
  * Replaces "<!--#echo var="author" -->" and "<!--#echo var="copyright" -->"
  * by the page's <meta name="author">s' content.
  */
 export declare class AuthorReplaceCommand extends SsiEchoVarReplaceCommand {
-    protected timeService: TimeService;
-    constructor(timeService: TimeService);
+    protected timeRenderer: TimeRenderer;
+    constructor(timeRenderer: TimeRenderer);
     protected createReplacer(context: HtmlRR0Context): Promise<RegexReplacer>;
 }

package/dist/people/author/AuthorReplaceCommand.js

@@ -4,9 +4,9 @@ import { SsiEchoVarReplaceCommand } from "ssg-api";
  * by the page's <meta name="author">s' content.
  */
 export class AuthorReplaceCommand extends SsiEchoVarReplaceCommand {
-    constructor(timeService) {
+    constructor(timeRenderer) {
         super("author");
-        this.timeService = timeService;
+        this.timeRenderer = timeRenderer;
     }
     async createReplacer(context) {
         return {
@@ -19,7 +19,7 @@ export class AuthorReplaceCommand extends SsiEchoVarReplaceCommand {
                     authorsHtml += authorsHtml ? ": " + copyright : copyright;
                 }
                 if (authorsHtml && context.time.getYear()) {
-                    const { result, replacement } = this.timeService.renderer.renderContent(context, undefined, { url: true });
+                    const { result, replacement } = this.timeRenderer.renderContent(context, undefined, { url: true, contentOnly: false });
                     result.append(replacement);
                     authorsHtml += ", " + result.outerHTML;
                 }

package/dist/people/author/AuthorReplaceCommandTest.js

@@ -8,7 +8,7 @@ describe("AuthorReplaceCommand", async () => {
     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 command = new AuthorReplaceCommand(rr0TestUtil.time.timeRenderer);
         const context = rr0TestUtil.newHtmlContext(timeFile, `This is published by <!--#echo var="author" -->!`);
         await command.execute(context);
         expect(context.file.meta.author).toEqual([]);
@@ -16,7 +16,7 @@ describe("AuthorReplaceCommand", async () => {
     });
     test("author only", async () => {
         const timeFile = rr0TestUtil.time.filePath("1/9/5/4/10/index.html");
-        const command = new AuthorReplaceCommand(timeService);
+        const command = new AuthorReplaceCommand(rr0TestUtil.time.timeRenderer);
         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);
@@ -26,7 +26,7 @@ describe("AuthorReplaceCommand", async () => {
     });
     test("copyright only", async () => {
         const timeFile = rr0TestUtil.time.filePath("1/9/5/4/10/index.html");
-        const command = new AuthorReplaceCommand(timeService);
+        const command = new AuthorReplaceCommand(rr0TestUtil.time.timeRenderer);
         const context = rr0TestUtil.newHtmlContext(timeFile, `This is published by <!--#echo var="author" -->!`);
         context.file.meta.copyright = "Some publication";
         const time = relativeTimeTextBuilder.build(undefined, context);
@@ -37,7 +37,7 @@ describe("AuthorReplaceCommand", async () => {
     });
     test("author with copyright", async () => {
         const timeFile = rr0TestUtil.time.filePath("1/9/5/4/10/index.html");
-        const command = new AuthorReplaceCommand(timeService);
+        const command = new AuthorReplaceCommand(rr0TestUtil.time.timeRenderer);
         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";

package/dist/science/crypto/ufo/enquete/dossier/CaseDirectoryStep.test.js

@@ -22,8 +22,8 @@ describe("DirectoryStep", () => {
         const eventFactory = new RR0EventFactory();
         const dataService = new AllDataService([new TypedDataFactory(eventFactory, "case")]);
         const caseFiles = await rr0TestUtil.caseFactory.getFiles();
-        const timeService = rr0TestUtil.time.getService();
-        const timeElementFactory = new TimeElementFactory(timeService.renderer);
+        const timeRenderer = rr0TestUtil.time.timeRenderer;
+        const timeElementFactory = new TimeElementFactory(timeRenderer);
         const caseService = new CaseService(dataService, rr0TestUtil.caseFactory, timeElementFactory, caseFiles);
         const ufoCasesExclusions = [];
         const step = new CaseDirectoryStep(caseService, caseService.files, ufoCasesExclusions, casesDirectoryPath, outputFunc, rr0TestUtil.config);

package/dist/science/crypto/ufo/enquete/dossier/CaseService.js

@@ -21,7 +21,7 @@ export class CaseService extends AbstractDataService {
         if (time) {
             caseContext.time = new TimeContext((_a = time.year) === null || _a === void 0 ? void 0 : _a.value, (_b = time.month) === null || _b === void 0 ? void 0 : _b.value, (_c = time.day) === null || _c === void 0 ? void 0 : _c.value, (_d = time.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = time.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = time.timeshift) === null || _f === void 0 ? void 0 : _f.toString());
             const options = { year: "numeric" };
-            const { result, replacement } = this.timeElementFactory.renderer.renderContent(caseContext, undefined, { url: true }, options);
+            const { result, replacement } = this.timeElementFactory.renderer.renderContent(caseContext, undefined, { url: true, contentOnly: false }, options);
             result.append(replacement);
             details.push(result.outerHTML);
         }

package/dist/time/EventRenderer.d.ts

@@ -6,6 +6,7 @@ import { RR0Data, RR0Event } from "@rr0/data";
 import { Source } from "@rr0/data/dist/source";
 import { PlaceRenderer } from "../place/PlaceRenderer";
 import { Place } from "@rr0/place";
+import { TimeRenderOptions } from "./html";
 /**
  * Render a case summary as HTML.
  */
@@ -18,7 +19,7 @@ export declare class EventRenderer<E extends RR0Event> {
     constructor(noteRenderer: NoteRenderer, sourceFactory: SourceFactory, sourceRenderer: SourceRenderer, timeElementFactory: TimeElementFactory);
     placeElement(context: HtmlRR0Context, place: Place): HTMLSpanElement;
     renderEnd(context: HtmlRR0Context, event: RR0Data, container: HTMLElement): Promise<void>;
-    render(context: HtmlRR0Context, event: E, container: HTMLElement): Promise<void>;
+    render(context: HtmlRR0Context, event: E, container: HTMLElement, options?: TimeRenderOptions): Promise<void>;
     renderNotes(context: HtmlRR0Context, notes: string[], container: HTMLElement): Promise<void>;
     renderSources(context: HtmlRR0Context, sources: Source[], container: HTMLElement): Promise<void>;
 }

package/dist/time/EventRenderer.js

@@ -29,12 +29,12 @@ export class EventRenderer {
         }
         container.append(".");
     }
-    async render(context, event, container) {
+    async render(context, event, container, options = { url: true, contentOnly: false }) {
         const eventContext = context.clone();
         const eventTime = eventContext.time.date = event.time;
         assert.ok(eventTime, `Event of type "${event.type}" has no time`);
         container.dataset.time = eventTime.toString();
-        const timeEl = this.timeElementFactory.create(eventContext, context);
+        const timeEl = this.timeElementFactory.create(eventContext, context, options);
         container.append(timeEl);
         const place = event.place;
         if (place) {

package/dist/time/TimeLinkDefaultHandler.d.ts

@@ -3,10 +3,12 @@ import { HtmlRR0Context } from "../RR0Context.js";
 import { Link } from "ssg-api";
 import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
 import { TimeService } from "./TimeService";
+import { TimeUrlBuilder } from "./TimeUrlBuilder";
 export declare class TimeLinkDefaultHandler implements LinkHandler<HtmlRR0Context> {
     protected service: TimeService;
+    protected urlBuilder: TimeUrlBuilder;
     protected timeTextBuilder: TimeTextBuilder;
-    constructor(service: TimeService, timeTextBuilder: TimeTextBuilder);
+    constructor(service: TimeService, urlBuilder: TimeUrlBuilder, timeTextBuilder: TimeTextBuilder);
     contents(context: HtmlRR0Context): Link | undefined;
     next(context: HtmlRR0Context): Link | undefined;
     prev(context: HtmlRR0Context): Link | undefined;

package/dist/time/TimeLinkDefaultHandler.js

@@ -1,16 +1,17 @@
 import { LinkType } from "ssg-api";
 export class TimeLinkDefaultHandler {
-    constructor(service, timeTextBuilder) {
+    constructor(service, urlBuilder, timeTextBuilder) {
         this.service = service;
+        this.urlBuilder = urlBuilder;
         this.timeTextBuilder = timeTextBuilder;
     }
     contents(context) {
         const prevLink = this.prev(context);
         if (prevLink) {
-            const service = this.service;
-            let contentUrl = service.matchExistingTimeFile(prevLink.url.substring(1));
-            if (contentUrl != service.root) {
-                const text = service.titleFromFile(context, contentUrl, this.timeTextBuilder);
+            const urlBuilder = this.urlBuilder;
+            let contentUrl = urlBuilder.matchExistingTimeFile(prevLink.url.substring(1));
+            if (contentUrl != urlBuilder.options.rootDir) {
+                const text = this.service.titleFromFile(context, contentUrl, this.timeTextBuilder);
                 if (text) {
                     return { type: LinkType.prev, text, url: "/" + contentUrl };
                 }

package/dist/time/TimeOptions.d.ts

@@ -0,0 +1,4 @@
+export type TimeOptions = {
+    readonly rootDir: string;
+    readonly files: string[];
+};

package/dist/time/TimeOptions.js

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

package/dist/time/TimeService.d.ts

@@ -1,34 +1,13 @@
-import { TimeRenderer } from "./html/TimeRenderer.js";
 import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
-import { TimeUrlBuilder } from "./TimeUrlBuilder";
 import { AbstractDataService, AllDataService, RR0Event, RR0EventJson } from "@rr0/data";
 import { HtmlRR0Context } from "../RR0Context";
 import { TimeContext } from "@rr0/time";
-export type TimeServiceOptions = {
-    readonly root: string;
-    readonly files: string[];
-};
+import { TimeOptions } from "./TimeOptions";
 export declare class TimeService extends AbstractDataService<RR0Event, RR0EventJson> {
-    readonly textBuilder: TimeTextBuilder;
-    readonly urlBuilder: TimeUrlBuilder;
+    protected options: TimeOptions;
     readonly timePathRegex: RegExp;
     static readonly defaultRegex: RegExp;
-    readonly renderer: TimeRenderer;
-    readonly root: string;
-    constructor(dataService: AllDataService, textBuilder: TimeTextBuilder, urlBuilder: TimeUrlBuilder, options: TimeServiceOptions, timePathRegex?: RegExp);
-    isTimeFile(filePath: string): boolean;
-    /**
-     * @return the found time URL or undefined if not found.
-     */
-    matchExistingTimeFile(url: string): string | undefined;
-    /**
-     * Instantiate a Date object matching an ISO date ("1972-08-12 16:34" for instance).
-     *
-     * Approximated dates like "~1972" will be converted to exact dates ("1972").
-     *
-     * @param isoDate
-     */
-    dateFromIso(isoDate: string): Date;
+    constructor(dataService: AllDataService, options: TimeOptions, timePathRegex?: RegExp);
     parseFileName(fileName: string): RegExpExecArray | null;
     titleFromFile(context: HtmlRR0Context, fileName: string, timeTextBuilder: TimeTextBuilder): string | undefined;
     contextFromFileName(context: HtmlRR0Context, fileName?: string): TimeContext | undefined;

package/dist/time/TimeService.js

@@ -1,42 +1,11 @@
-import { TimeRenderer } from "./html/TimeRenderer.js";
 import { AbstractDataService } from "@rr0/data";
 import { RR0ContextImpl } from "../RR0Context";
 import { StringUtil } from "../util";
 export class TimeService extends AbstractDataService {
-    constructor(dataService, textBuilder, urlBuilder, options, timePathRegex = TimeService.defaultRegex) {
+    constructor(dataService, options, timePathRegex = TimeService.defaultRegex) {
         super(dataService, null, options.files);
-        this.textBuilder = textBuilder;
-        this.urlBuilder = urlBuilder;
+        this.options = options;
         this.timePathRegex = timePathRegex;
-        this.root = options.root;
-        this.renderer = new TimeRenderer(this, this.textBuilder);
-    }
-    isTimeFile(filePath) {
-        return this.files.includes(filePath);
-    }
-    /**
-     * @return the found time URL or undefined if not found.
-     */
-    matchExistingTimeFile(url) {
-        while (url && url !== this.root && this.files.indexOf(`${url}/index.html`) < 0) {
-            const slash = url.lastIndexOf("/");
-            url = url.substring(0, slash);
-        }
-        return url === this.root ? undefined : url;
-    }
-    /**
-     * Instantiate a Date object matching an ISO date ("1972-08-12 16:34" for instance).
-     *
-     * Approximated dates like "~1972" will be converted to exact dates ("1972").
-     *
-     * @param isoDate
-     */
-    dateFromIso(isoDate) {
-        isoDate = isoDate.replace("~", "");
-        if (isoDate.charAt(0) === "-") {
-            isoDate = "-" + "0".repeat(7 - isoDate.length) + isoDate.substring(1);
-        }
-        return new Date(isoDate);
     }
     parseFileName(fileName) {
         return this.timePathRegex.exec(fileName);

package/dist/time/TimeTagReplaceCommand.test.js

@@ -5,11 +5,11 @@ import { DomReplaceCommand } from "ssg-api";
 import { TimeReplacer } from "./html/TimeReplacer.js";
 import path from "path";
 describe("HtmlTagReplaceCommand", async () => {
-    const timeRoot = rr0TestUtil.time.timeOptions.root;
-    await rr0TestUtil.time.getService({ root: path.join(rr0TestUtil.rootDir, timeRoot), files: ["time/2/0/0/4/index.html"] });
+    const timeRoot = rr0TestUtil.time.timeOptions.rootDir;
+    const timeService = await rr0TestUtil.time.getService({ rootDir: path.join(rr0TestUtil.rootDir, timeRoot), files: ["time/2/0/0/4/index.html"] });
     test("replace time tag", async () => {
         const replacer = new TimeReplacer(rr0TestUtil.time.timeElementFactory);
-        const command = new DomReplaceCommand("time", new TimeReplacerFactory(replacer));
+        const command = new DomReplaceCommand("time", new TimeReplacerFactory(replacer, rr0TestUtil.time.urlBuilder));
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", `<time>2004</time> <a href="/science/crypto/ufo/enquete/dossier/Roswell">Roswell</a>`);
         await command.execute(context);
         expect(context.file.contents).toBe(`<html><head><meta name="generator" content="ssg-api"></head><body><span class="time-resolved">en <a href="${path.join("/", timeRoot, "2/0/0/4/")}"><time datetime="2004">2004</time></a></span> <a href="/science/crypto/ufo/enquete/dossier/Roswell">Roswell</a></body></html>`);

package/dist/time/TimeTestUtil.d.ts

@@ -1,16 +1,18 @@
-import { TimeElementFactory, TimeService, TimeServiceOptions, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
+import { TimeElementFactory, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
 import { RR0TestUtil } from "../test";
 import { HtmlRR0Context } from "../RR0Context";
+import { TimeOptions } from "./TimeOptions";
 export declare class TimeTestUtil {
     readonly timeTextBuilder: TimeTextBuilder;
     timeElementFactory: TimeElementFactory;
-    timeOptions: TimeServiceOptions;
+    timeOptions: TimeOptions;
     urlBuilder: TimeUrlBuilder;
     protected timeService: TimeService;
-    fullRoot: string;
+    readonly fullRoot: string;
+    readonly timeRenderer: TimeRenderer;
     constructor(rr0TestUtil: RR0TestUtil);
     newHtmlContext(inputFileName: string, contents?: string, locale?: string): HtmlRR0Context;
     filePath(inputFileName: string): string;
     url(inputFileName: string): string;
-    getService(options?: TimeServiceOptions): TimeService;
+    getService(options?: TimeOptions): TimeService;
 }

package/dist/time/TimeTestUtil.js

@@ -1,28 +1,30 @@
 import path from "path";
-import { TimeElementFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
+import { TimeElementFactory, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
 import { rr0TestUtil } from "../test";
 export class TimeTestUtil {
     constructor(rr0TestUtil) {
-        this.timeOptions = { root: "time", files: [] };
-        this.urlBuilder = new TimeUrlBuilder({ rootDir: this.timeOptions.root });
+        this.timeOptions = { rootDir: "time", files: [] };
+        this.urlBuilder = new TimeUrlBuilder(this.timeOptions);
         this.timeTextBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
-        this.fullRoot = path.join(rr0TestUtil.rootDir, this.timeOptions.root);
+        this.fullRoot = path.join(rr0TestUtil.rootDir, this.timeOptions.rootDir);
+        this.timeRenderer = new TimeRenderer(this.urlBuilder, this.timeTextBuilder);
     }
     newHtmlContext(inputFileName, contents, locale = "fr") {
         return rr0TestUtil.newHtmlContext(this.filePath(inputFileName), contents, locale);
     }
     filePath(inputFileName) {
-        return path.join(this.timeOptions.root, inputFileName);
+        return path.join(this.timeOptions.rootDir, inputFileName);
     }
     url(inputFileName) {
         return path.join("/", this.filePath(inputFileName));
     }
     getService(options = this.timeOptions) {
         if (!this.timeService
-            || this.timeService.root !== options.root
+            || this.timeOptions.rootDir !== options.rootDir
             || JSON.stringify(this.timeService.files) !== JSON.stringify(options.files)) {
-            this.timeService = new TimeService(rr0TestUtil.dataService, this.timeTextBuilder, this.urlBuilder, options);
-            this.timeElementFactory = new TimeElementFactory(this.timeService.renderer);
+            this.timeOptions = options;
+            this.timeService = new TimeService(rr0TestUtil.dataService, options);
+            this.timeElementFactory = new TimeElementFactory(this.timeRenderer);
         }
         return this.timeService;
     }

package/dist/time/TimeUrlBuilder.d.ts

@@ -1,11 +1,15 @@
 import { Level2Date as EdtfDate, TimeContext } from "@rr0/time";
-export type TimeUrlBuilderOptions = {
-    rootDir: string;
-};
+import { TimeOptions } from "./TimeOptions";
+export type TimeUrlBuilderOptions = TimeOptions;
 export declare class TimeUrlBuilder {
     readonly options: TimeUrlBuilderOptions;
     constructor(options: TimeUrlBuilderOptions);
     fromContext(time: TimeContext): string;
     fromEdtf(time: EdtfDate): string;
     fromYYMMDD(year: number, month: number, day: number): string;
+    isTimeFile(filePath: string): boolean;
+    /**
+     * @return the found time URL or undefined if not found.
+     */
+    matchExistingTimeFile(url: string): string | undefined;
 }

package/dist/time/TimeUrlBuilder.js

@@ -23,4 +23,18 @@ export class TimeUrlBuilder {
         }
         return url;
     }
+    isTimeFile(filePath) {
+        return this.options.files.includes(filePath);
+    }
+    /**
+     * @return the found time URL or undefined if not found.
+     */
+    matchExistingTimeFile(url) {
+        const rootDir = this.options.rootDir;
+        while (url && url !== rootDir && !this.isTimeFile(`${url}/index.html`)) {
+            const slash = url.lastIndexOf("/");
+            url = url.substring(0, slash);
+        }
+        return url === rootDir ? undefined : url;
+    }
 }

package/dist/time/TimeUrlBuilder.test.js

@@ -7,7 +7,8 @@ import path from "path";
 describe("TimeUrlBuilder", () => {
     const config = rr0TestUtil.config;
     const rootDir = rr0TestUtil.time.fullRoot;
-    const timeUrlBuilder = new TimeUrlBuilder({ rootDir });
+    const timeOptions = { rootDir, files: [] };
+    const timeUrlBuilder = new TimeUrlBuilder(timeOptions);
     test("builds year", () => {
         {
             const context = new RR0ContextImpl("fr", new TimeContext(), config);

package/dist/time/datasource/ChronologyReplacer.js

@@ -44,7 +44,7 @@ export class ChronologyReplacer {
                     for (const c of allCases) {
                         const outDoc = context.file.document;
                         const eventEl = outDoc.createElement("li");
-                        await this.renderer.render(context, c, eventEl);
+                        await this.renderer.render(context, c, eventEl, { url: true, contentOnly: true });
                         element.append(eventEl);
                     }
                 }

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

@@ -2,12 +2,12 @@ import { DomReplacer, ReplacerFactory } from "ssg-api";
 import { ChronologyReplacer } from "./ChronologyReplacer.js";
 import { HtmlRR0Context } from "../../RR0Context.js";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
-import { TimeService } from "../TimeService.js";
 import { RR0CaseMapping } from "./rr0/RR0CaseMapping.js";
+import { TimeUrlBuilder } from "../TimeUrlBuilder";
 export declare class ChronologyReplacerFactory implements ReplacerFactory<DomReplacer> {
-    protected timeService: TimeService;
+    protected timeUrlBuilder: TimeUrlBuilder;
     protected readonly replacer: ChronologyReplacer;
-    constructor(timeService: TimeService, datasources: RR0CaseMapping<any>[], caseRenderer: CaseSummaryRenderer);
+    constructor(timeUrlBuilder: TimeUrlBuilder, datasources: RR0CaseMapping<any>[], caseRenderer: CaseSummaryRenderer);
     /**
      * Creates a contextual replacer for time tags.
      *

package/dist/time/datasource/ChronologyReplacerFactory.js

@@ -1,7 +1,7 @@
 import { ChronologyReplacer } from "./ChronologyReplacer.js";
 export class ChronologyReplacerFactory {
-    constructor(timeService, datasources, caseRenderer) {
-        this.timeService = timeService;
+    constructor(timeUrlBuilder, datasources, caseRenderer) {
+        this.timeUrlBuilder = timeUrlBuilder;
         this.replacer = new ChronologyReplacer(datasources, caseRenderer);
     }
     /**
@@ -12,7 +12,7 @@ export class ChronologyReplacerFactory {
     async create(context) {
         return {
             replace: async (ul) => {
-                const isTimeFile = this.timeService.isTimeFile(context.file.name);
+                const isTimeFile = this.timeUrlBuilder.isTimeFile(context.file.name);
                 if (isTimeFile) {
                     ul = await this.replacer.replacement(context, ul);
                 }

package/dist/time/datasource/DatasourceTestCase.js

@@ -45,7 +45,7 @@ export class DatasourceTestCase {
         const http = new HttpSource();
         const timeService = await rr0TestUtil.time.getService();
         const sourceFactory = new SourceFactory(dataService, http, baseUrl, this.intlOptions, timeService);
-        const timeElementFactory = new TimeElementFactory(new TimeRenderer(timeService, this.timeTextBuilder));
+        const timeElementFactory = new TimeElementFactory(new TimeRenderer(rr0TestUtil.time.urlBuilder, this.timeTextBuilder));
         const eventRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(this.timeTextBuilder), timeElementFactory);
         const items = [];
         for (const c of cases) {

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

@@ -88,7 +88,7 @@ export class RR0HttpDatasource extends RR0Datasource {
                 time = EdtfDate.fromString(timeStr);
             }
             catch (e) {
-                console.warn("Could not parse source time", e);
+                // console.warn("Could not parse source time", e)
             }
             if (time) {
                 pubItems.pop();

package/dist/time/html/TimeElementFactory.js

@@ -6,7 +6,7 @@ export class TimeElementFactory {
     constructor(renderer) {
         this.renderer = renderer;
     }
-    create(context, previousContext, options = { url: true }) {
+    create(context, previousContext, options = { url: true, contentOnly: false }) {
         let replacement;
         const time = context.time;
         const interval = time.interval;
@@ -52,7 +52,7 @@ export class TimeElementFactory {
         result.append(startingReplacement, replacement);
         return result;
     }
-    valueReplacement(context, previousContext, options = { url: true }) {
+    valueReplacement(context, previousContext, options = { url: true, contentOnly: false }) {
         let replacement;
         if (context.time.duration) {
             replacement = this.durationReplacement(context);
@@ -100,7 +100,7 @@ export class TimeElementFactory {
         }
         return replacement;
     }
-    dateTimeReplacement(context, previousContext, options = { url: true }) {
+    dateTimeReplacement(context, previousContext, options = { url: true, contentOnly: false }) {
         let replacement = undefined;
         if (context.time.isDefined()) {
             replacement = this.renderer.render(context, previousContext, options);

package/dist/time/html/TimeRenderer.d.ts

@@ -1,15 +1,16 @@
 import { HtmlRR0Context, RR0Context } from "../../RR0Context.js";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { RelativeTimeTextBuilder } from "../text/RelativeTimeTextBuilder.js";
-import { TimeService } from "../TimeService";
+import { TimeUrlBuilder } from "../TimeUrlBuilder";
 export interface TimeRenderOptions {
     url: boolean;
+    contentOnly: boolean;
 }
 export declare class TimeRenderer {
-    readonly service: TimeService;
+    readonly urlBuilder: TimeUrlBuilder;
     protected textBuilder: TimeTextBuilder;
     protected readonly relativeTextBuilder: RelativeTimeTextBuilder;
-    constructor(service: TimeService, textBuilder: TimeTextBuilder);
+    constructor(urlBuilder: TimeUrlBuilder, textBuilder: TimeTextBuilder);
     render(context: HtmlRR0Context, previousContext?: RR0Context, options?: TimeRenderOptions): HTMLElement;
     renderContent(context: HtmlRR0Context, previousContext: RR0Context, options: TimeRenderOptions, renderOptions?: Intl.DateTimeFormatOptions): {
         result: HTMLElement;

package/dist/time/html/TimeRenderer.js

@@ -2,22 +2,25 @@ import { RelativeTimeTextBuilder } from "../text/RelativeTimeTextBuilder.js";
 import { UrlUtil } from "../../util/url/UrlUtil.js";
 import { TimeReplacer } from "./TimeReplacer.js";
 export class TimeRenderer {
-    constructor(service, textBuilder) {
-        this.service = service;
+    constructor(urlBuilder, textBuilder) {
+        this.urlBuilder = urlBuilder;
         this.textBuilder = textBuilder;
         this.relativeTextBuilder = new RelativeTimeTextBuilder(textBuilder);
     }
-    render(context, previousContext, options = { url: true }) {
+    render(context, previousContext, options = { url: true, contentOnly: false }) {
         const { result, replacement } = this.renderContent(context, previousContext, options);
-        const timeMessages = context.messages.context.time;
-        const time = context.time;
-        const message = time.getDayOfMonth() ? timeMessages.on : timeMessages.in;
-        result.append(message(time.approximate), replacement);
+        if (!options.contentOnly) {
+            const timeMessages = context.messages.context.time;
+            const time = context.time;
+            const message = time.getDayOfMonth() ? timeMessages.on : timeMessages.in;
+            result.append(message(time.approximate));
+        }
+        result.append(replacement);
         return result;
     }
     renderContent(context, previousContext, options, renderOptions = this.textBuilder.options) {
         const time = context.time;
-        const absoluteTimeUrl = this.service.urlBuilder.fromContext(time);
+        const absoluteTimeUrl = this.urlBuilder.fromContext(time);
         const title = this.textBuilder.build(context, renderOptions);
         const text = (previousContext ? this.relativeTextBuilder.build(previousContext, context) : undefined) || title;
         const file = context.file;
@@ -30,7 +33,7 @@ export class TimeRenderer {
         }
         timeEl.textContent = text;
         const dirName = currentFileName.substring(0, currentFileName.indexOf("/index"));
-        const existingUrl = options.url && this.service.matchExistingTimeFile(absoluteTimeUrl);
+        const existingUrl = options.url && this.urlBuilder.matchExistingTimeFile(absoluteTimeUrl);
         if (existingUrl && existingUrl !== dirName) {
             const a = replacement = doc.createElement("a");
             a.href = UrlUtil.absolute(existingUrl);

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

@@ -6,9 +6,9 @@ import { TimeElementFactory } from "./TimeElementFactory.js";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import path from "path";
 describe("TimeReplacer", async () => {
-    const timeRoot = rr0TestUtil.time.timeOptions.root;
-    const timeService = await rr0TestUtil.time.getService({
-        root: timeRoot,
+    const timeRoot = rr0TestUtil.time.timeOptions.rootDir;
+    const timeOptions = {
+        rootDir: timeRoot,
         files: [
             path.join(timeRoot, "1/9/4/7/07/02/index.html"),
             path.join(timeRoot, "2/0/0/3/index.html"),
@@ -21,13 +21,14 @@ describe("TimeReplacer", async () => {
             path.join(timeRoot, "2/0/0/6/07/14/index.html"),
             path.join(timeRoot, "2/0/0/7/06/15/index.html")
         ]
-    });
+    };
+    const timeService = await rr0TestUtil.time.getService(timeOptions);
     const textBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
-    const timeRenderer = new TimeRenderer(timeService, textBuilder);
+    const timeRenderer = new TimeRenderer(rr0TestUtil.time.urlBuilder, textBuilder);
     const timeElementFactory = new TimeElementFactory(timeRenderer);
     const replacer = new TimeReplacer(timeElementFactory);
     function timeUrl(pathStr) {
-        return path.join("/", timeService.root, pathStr, "index.html");
+        return path.join("/", timeOptions.rootDir, pathStr, "index.html");
     }
     test("parses year", async () => {
         {
@@ -35,7 +36,7 @@ describe("TimeReplacer", async () => {
             const timeEl = context.file.document.createElement("time");
             timeEl.textContent = "2003";
             const replacement = await replacer.replacement(context, timeEl);
-            expect(replacement.outerHTML).toBe(`<span class="time-resolved">en <a href="${path.join("/", timeService.root, "2/0/0/3/")}"><time datetime="2003">2003</time></a></span>`);
+            expect(replacement.outerHTML).toBe(`<span class="time-resolved">en <a href="${path.join("/", timeOptions.rootDir, "2/0/0/3/")}"><time datetime="2003">2003</time></a></span>`);
             expect(context.time.getYear()).toBe(2003);
             expect(context.time.getMonth()).toBe(undefined);
             expect(context.time.getDayOfMonth()).toBe(undefined);
@@ -48,7 +49,7 @@ describe("TimeReplacer", async () => {
             const timeEl = context.file.document.createElement("time");
             timeEl.innerHTML = "2003\n      ";
             const replacement = await replacer.replacement(context, timeEl);
-            expect(replacement.outerHTML).toBe(`<span class="time-resolved">en <a href="${path.join("/", timeService.root, "2/0/0/3/")}"><time datetime="2003">2003</time></a></span>`);
+            expect(replacement.outerHTML).toBe(`<span class="time-resolved">en <a href="${path.join("/", timeOptions.rootDir, "2/0/0/3/")}"><time datetime="2003">2003</time></a></span>`);
             expect(context.time.getYear()).toBe(2003);
             expect(context.time.getMonth()).toBe(undefined);
             expect(context.time.getDayOfMonth()).toBe(undefined);
@@ -64,7 +65,7 @@ describe("TimeReplacer", async () => {
         original.textContent = interval;
         const replaced = await replacer.replacement(context, original);
         expect(replaced.outerHTML)
-            .toBe(`<span class="time-interval"><span class="time-resolved">en <a href="${path.join("/", timeService.root, "2/0/0/3/")}"><time datetime="2003">2003</time></a></span> à <span class="time-resolved">en <a href="${path.join("/", timeService.root, "2/0/0/4/")}"><time datetime="2004">2004</time></a></span></span>`);
+            .toBe(`<span class="time-interval"><span class="time-resolved">en <a href="${path.join("/", timeOptions.rootDir, "2/0/0/3/")}"><time datetime="2003">2003</time></a></span> à <span class="time-resolved">en <a href="${path.join("/", timeOptions.rootDir, "2/0/0/4/")}"><time datetime="2004">2004</time></a></span></span>`);
         expect(context.time.getYear()).toBe(2004);
         expect(context.time.getMonth()).toBe(undefined);
         expect(context.time.getDayOfMonth()).toBe(undefined);
@@ -93,7 +94,7 @@ describe("TimeReplacer", async () => {
             original.textContent = "2003-12-24T10:22CDT";
             const replacement = await replacer.replacement(context, original);
             expect(replacement.outerHTML)
-                .toBe(`<span class="time-resolved">le <a href="${path.join("/", timeService.root, "2/0/0/3/12/24/")}"><time datetime="2003-12-24T10:22-05">mercredi 24 décembre 2003 à 10:22</time></a></span>`); // TODO: Text should have timezone info
+                .toBe(`<span class="time-resolved">le <a href="${path.join("/", timeOptions.rootDir, "2/0/0/3/12/24/")}"><time datetime="2003-12-24T10:22-05">mercredi 24 décembre 2003 à 10:22</time></a></span>`); // TODO: Text should have timezone info
             expect(context.time.getYear()).toBe(2003);
             expect(context.time.getMonth()).toBe(12);
             expect(context.time.getDayOfMonth()).toBe(24);
@@ -120,7 +121,7 @@ describe("TimeReplacer", async () => {
         const original = context.file.document.createElement("time");
         original.textContent = "2004-09";
         const replacement = await replacer.replacement(context, original);
-        expect(replacement.outerHTML).toBe(`<span class="time-resolved">en <a href="${path.join("/", timeService.root, "2/0/0/4/09/")}"><time datetime="2004-09">septembre 2004</time></a></span>`);
+        expect(replacement.outerHTML).toBe(`<span class="time-resolved">en <a href="${path.join("/", timeOptions.rootDir, "2/0/0/4/09/")}"><time datetime="2004-09">septembre 2004</time></a></span>`);
         expect(context.time.getYear()).toBe(2004);
         expect(context.time.getMonth()).toBe(9);
         expect(context.time.getDayOfMonth()).toBe(undefined);
@@ -133,7 +134,7 @@ describe("TimeReplacer", async () => {
             const timeEl = context.file.document.createElement("time");
             timeEl.textContent = "2005-08-23";
             const replacement = await replacer.replacement(context, timeEl);
-            expect(replacement.outerHTML).toBe(`<span class="time-resolved">le <a href="${path.join("/", timeService.root, "2/0/0/5/08/23/")}"><time datetime="2005-08-23">mardi 23 août 2005</time></a></span>`);
+            expect(replacement.outerHTML).toBe(`<span class="time-resolved">le <a href="${path.join("/", timeOptions.rootDir, "2/0/0/5/08/23/")}"><time datetime="2005-08-23">mardi 23 août 2005</time></a></span>`);
             expect(context.time.getYear()).toBe(2005);
             expect(context.time.getMonth()).toBe(8);
             expect(context.time.getDayOfMonth()).toBe(23);
@@ -201,7 +202,7 @@ describe("TimeReplacer", async () => {
             const timeEl = context.file.document.createElement("time");
             timeEl.textContent = "2006-07-14 17:56";
             const replacement = await replacer.replacement(context, timeEl);
-            expect(replacement.outerHTML).toBe(`<span class="time-resolved">le <a href="${path.join("/", timeService.root, "2/0/0/6/07/14/")}"><time datetime="2006-07-14T17:56">vendredi 14 juillet 2006 à 17:56</time></a></span>`);
+            expect(replacement.outerHTML).toBe(`<span class="time-resolved">le <a href="${path.join("/", timeOptions.rootDir, "2/0/0/6/07/14/")}"><time datetime="2006-07-14T17:56">vendredi 14 juillet 2006 à 17:56</time></a></span>`);
             expect(context.time.getYear()).toBe(2006);
             expect(context.time.getMonth()).toBe(7);
             expect(context.time.getDayOfMonth()).toBe(14);
@@ -211,7 +212,7 @@ describe("TimeReplacer", async () => {
             const timeEl1 = context.file.document.createElement("time");
             timeEl1.textContent = "2007-06-15 18:47";
             const replacement1 = await replacer.replacement(context, timeEl1);
-            expect(replacement1.outerHTML).toBe(`<span class="time-resolved">le <a href="${path.join("/", timeService.root, "2/0/0/7/06/15/")}"><time datetime="2007-06-15T18:47">vendredi 15 juin 2007 à 18:47</time></a></span>`);
+            expect(replacement1.outerHTML).toBe(`<span class="time-resolved">le <a href="${path.join("/", timeOptions.rootDir, "2/0/0/7/06/15/")}"><time datetime="2007-06-15T18:47">vendredi 15 juin 2007 à 18:47</time></a></span>`);
             expect(context.time.getYear()).toBe(2007);
             expect(context.time.getMonth()).toBe(6);
             expect(context.time.getDayOfMonth()).toBe(15);

package/dist/time/html/TimeReplacerFactory.d.ts

@@ -1,9 +1,11 @@
 import { TimeReplacer } from "./TimeReplacer.js";
 import { HtmlRR0Context } from "../../RR0Context.js";
 import { DomReplacer, ReplacerFactory } from "ssg-api";
+import { TimeUrlBuilder } from "../TimeUrlBuilder";
 export declare class TimeReplacerFactory implements ReplacerFactory<DomReplacer> {
     protected readonly replacer: TimeReplacer;
-    constructor(replacer: TimeReplacer);
+    protected readonly timeUrlBuilder: TimeUrlBuilder;
+    constructor(replacer: TimeReplacer, timeUrlBuilder: TimeUrlBuilder);
     /**
      * Creates a contextual replacer for time tags.
      *

package/dist/time/html/TimeReplacerFactory.js

@@ -1,6 +1,7 @@
 export class TimeReplacerFactory {
-    constructor(replacer) {
+    constructor(replacer, timeUrlBuilder) {
         this.replacer = replacer;
+        this.timeUrlBuilder = timeUrlBuilder;
     }
     /**
      * Creates a contextual replacer for time tags.
@@ -10,7 +11,7 @@ export class TimeReplacerFactory {
     async create(context) {
         return {
             replace: (original) => {
-                return this.replacer.replacement(this.replacer.factory.renderer.service.isTimeFile(context.file.name) ? context.clone() : context, original);
+                return this.replacer.replacement(this.timeUrlBuilder.isTimeFile(context.file.name) ? context.clone() : context, original);
             }
         };
     }

package/dist/time/index.d.ts

@@ -10,3 +10,4 @@ export * from "./TimeLinkDefaultHandler.js";
 export * from "./TimeService.js";
 export * from "./TimeUrlBuilder.js";
 export * from "./datasource/index.js";
+export * from "./TimeOptions.js";

package/dist/time/index.js

@@ -10,3 +10,4 @@ export * from "./TimeLinkDefaultHandler.js";
 export * from "./TimeService.js";
 export * from "./TimeUrlBuilder.js";
 export * from "./datasource/index.js";
+export * from "./TimeOptions.js";

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.14",
+  "version": "0.3.16",
   "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.12",
+    "@rr0/data": "^0.3.13",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.2",
-    "@rr0/time": "^0.10.0",
+    "@rr0/time": "^0.11.0",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",
     "glob": "^11.0.0",