@rr0/cms 0.1.20 → 0.1.22

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 { TimeTextBuilder } from "./time/index.js";
+import { TimeService } from "./time/index.js";
 /**
  * Create a preview image for each page sharing.
  */
@@ -9,11 +9,11 @@ export declare class OpenGraphCommand implements ReplaceCommand<HtmlRR0Context>
     protected outDir: string;
     protected timeFiles: string[];
     protected baseUrl: string;
-    protected timeTextBuilder: TimeTextBuilder;
+    protected timeService: TimeService;
     protected width: number;
     protected height: number;
     protected num: number;
-    constructor(outDir: string, timeFiles: string[], baseUrl: string, timeTextBuilder: TimeTextBuilder, width?: number, height?: number);
+    constructor(outDir: string, timeFiles: string[], baseUrl: string, timeService: TimeService, width?: number, height?: number);
     execute(context: HtmlRR0Context): Promise<void>;
     getInfoStr(context: HtmlRR0Context): string;
     contentStepEnd(): Promise<void>;

package/dist/OpenGraphCommand.js

@@ -1,17 +1,16 @@
 import { createCanvas, loadImage } from "canvas";
 import fs from "fs";
 import path from "path";
-import { RR0ContentStep } from "./RR0ContentStep.js";
 import assert from "assert";
 /**
  * Create a preview image for each page sharing.
  */
 export class OpenGraphCommand {
-    constructor(outDir, timeFiles, baseUrl, timeTextBuilder, width = 1200, height = 600) {
+    constructor(outDir, timeFiles, baseUrl, timeService, width = 1200, height = 600) {
         this.outDir = outDir;
         this.timeFiles = timeFiles;
         this.baseUrl = baseUrl;
-        this.timeTextBuilder = timeTextBuilder;
+        this.timeService = timeService;
         this.width = width;
         this.height = height;
         this.num = 0;
@@ -49,14 +48,14 @@ export class OpenGraphCommand {
             timeStr = "Chronologie";
         }
         else {
-            const timeContext = RR0ContentStep.setTimeFromPath(context, fileName);
+            const timeContext = this.timeService.gSetTimeFromPath(context, fileName);
             if (timeContext) {
                 context.time.setYear(timeContext.getYear());
                 context.time.setMonth(timeContext.getMonth());
                 context.time.setDayOfMonth(timeContext.getDayOfMonth());
                 context.time.setHour(undefined);
                 context.time.setMinutes(undefined);
-                timeStr = this.timeTextBuilder.build(context);
+                timeStr = this.timeService.textBuilder.build(context);
             }
         }
         const copyrightStr = context.file.meta.copyright || "RR0.org";

package/dist/OpenGraphCommand.test.js

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

package/dist/RR0Build.d.ts

@@ -18,7 +18,6 @@ export interface RR0BuildOptions {
     sourceRegistryFileName: string;
     directoryExcluded: string[];
     directoryOptions: PeopleDirectoryStepOptions;
-    inDir?: (path: string) => string;
 }
 export interface RR0BuildArgs {
     /**

package/dist/RR0Build.js

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs";
-import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, Time, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
+import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
 import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/index.js";
 import { GooglePlaceService, PlaceReplacerFactory } from "./place/index.js";
 import { OrganizationFactory, OrganizationService } from "./org/index.js";
@@ -56,7 +56,7 @@ export class RR0Build {
         this.orgService = new OrganizationService([], "org", undefined);
         const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
         const timeOptions = options.timeOptions;
-        const timeRoot = this.options.inDir(timeOptions.root);
+        const timeRoot = timeOptions.root;
         const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeRoot });
         const eventFactory = new RR0EventFactory();
         const sightingFactory = new TypedDataFactory(eventFactory, "sighting", ["index"]);
@@ -83,19 +83,19 @@ export class RR0Build {
         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, peopleFiles);
+        const peopleService = new PeopleService(dataService, this.peopleFactory, peopleFiles, timeService);
         const peopleList = await peopleService.getAll();
         context.setVar("peopleFilesCount", peopleList.length);
         const bookMeta = new Map();
         const bookLinks = new Map();
         const config = this.config;
-        const ufoCaseDirectoryFile = this.options.inDir(this.options.ufoCaseDirectoryFile);
-        const ufoCasesExclusions = this.options.ufoCasesExclusions.map(this.options.inDir);
+        const ufoCaseDirectoryFile = this.options.ufoCaseDirectoryFile;
+        const ufoCasesExclusions = this.options.ufoCasesExclusions;
         const ufoCasesStep = new CaseDirectoryStep(caseService, caseService.files, ufoCasesExclusions, ufoCaseDirectoryFile, outputFunc, config);
         const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, config, peopleService, this.options.directoryExcluded);
         const directoryOptions = this.options.directoryOptions;
         for (const directoryOption in directoryOptions) {
-            directoryOptions[directoryOption] = this.options.inDir(directoryOptions[directoryOption]);
+            directoryOptions[directoryOption] = directoryOptions[directoryOption];
         }
         const peopleSteps = await peopleDirectoryFactory.create(directoryOptions);
         // Publish case.json files so that vraiufo.com will find them
@@ -103,10 +103,11 @@ export class RR0Build {
         copies.push(...(ufoCasesStep.config.rootDirs).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");
-        copies.push(...(peopleSteps.reduce((rootDirs, peopleStep) => {
+        const dirsContainingPeopleJson = peopleSteps.reduce((rootDirs, peopleStep) => {
             rootDirs.push(...peopleStep.config.rootDirs);
             return rootDirs;
-        }, [])).map(dir => path.join(dir, "people.json")));
+        }, []);
+        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 timeTextBuilder = this.timeTextBuilder;
         const searchVisitor = new SearchVisitor({ notIndexedUrls: ["404.html", "Referencement.html"], indexWords: false }, timeTextBuilder);
@@ -114,8 +115,8 @@ export class RR0Build {
         const http = new HttpSource();
         const baseUrl = this.options.siteBaseUrl;
         const timeFormat = this.options.timeFormat;
-        const sourceRegistryFileName = this.options.inDir(this.options.sourceRegistryFileName);
-        const sourceFactory = new PersistentSourceRegistry(dataService, http, baseUrl, sourceRegistryFileName, timeFormat);
+        const sourceRegistryFileName = this.options.sourceRegistryFileName;
+        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);
@@ -128,7 +129,7 @@ export class RR0Build {
         ], caseRenderer));
         const timeDefaultHandler = (context) => {
             let title;
-            title = Time.titleFromFile(context, context.file.name, timeTextBuilder);
+            title = timeService.titleFromFile(context, context.file.name, timeTextBuilder);
             return title;
         };
         const pageReplaceCommands = [
@@ -188,19 +189,22 @@ export class RR0Build {
                 return path.join(outDir, "netlify.toml");
             }
         };
-        const options = this.options;
-        const contentRoots = options.contentRoots.map(options.inDir);
-        const includeStep = new RR0ContentStep([htAccessToNetlifyConfig, {
-                roots: contentRoots,
-                replacements: [new class extends SsiIncludeReplaceCommand {
-                        filePath(context, fileNameArg) {
-                            const dirName = path.dirname(context.file.name);
-                            const filePath = fileNameArg.startsWith("/") ? options.inDir(fileNameArg) : path.join(dirName, fileNameArg);
-                            return filePath;
-                        }
-                    }([csvTransformer])],
-                getOutputPath
-            }], outputFunc, [], [], force, "content includes", toProcess);
+        const contentRoots = this.options.contentRoots;
+        const contentStepOptions = {
+            contentConfigs: [htAccessToNetlifyConfig, {
+                    roots: contentRoots,
+                    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);
+                            }
+                        }([csvTransformer])],
+                    getOutputPath
+                }],
+            outputFunc, fileVisitors: [], contentVisitors: [], force, name: "content includes", toProcess
+        };
+        const includeStep = new RR0ContentStep(contentStepOptions, timeService);
         ssg.add(includeStep);
         ssg.add(ufoCasesStep);
         ssg.add(...peopleSteps);
@@ -216,9 +220,12 @@ export class RR0Build {
                 new OutlineReplaceCommand(),
                 new AnchorReplaceCommand(baseUrl, [new CaseAnchorHandler(caseService, timeTextBuilder), new DataAnchorHandler(dataService)]),
                 new ImageCommand(outDir, 275, 500),
-                new OpenGraphCommand(outDir, timeFiles, baseUrl, timeTextBuilder)
+                new OpenGraphCommand(outDir, timeFiles, baseUrl, timeService)
             ];
-            ssg.add(new RR0ContentStep([{ roots: contentRoots, replacements: contentReplacements, getOutputPath }], outputFunc, [], contentVisitors, force, "contents replacements", toProcess));
+            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));
@@ -233,8 +240,8 @@ export class RR0Build {
         if (copies) {
             const copyConfig = {
                 getOutputPath,
-                sourcePatterns: copies.map(this.options.inDir),
-                options: { ignore: ["node_modules/**", "out/**"].map(this.options.inDir) }
+                sourcePatterns: Array.from(new Set(copies)),
+                options: { ignore: ["node_modules/**", "out/**"] }
             };
             ssg.add(new CopyStep(copyConfig));
         }

package/dist/RR0Build.test.js

@@ -31,7 +31,7 @@ describe("Build", () => {
             "tech/**/*.html",
             "udb/*.html",
             "js/**/*.html"
-        ];
+        ].map(testFilePath);
     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",
@@ -47,14 +47,14 @@ 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);
     const outDir = "out";
     const googleMapsApiKey = process.env.GOOGLE_MAPS_API_KEY;
     if (!googleMapsApiKey) {
         throw Error("GOOGLE_MAPS_API_KEY is required");
     }
     const timeOptions = {
-        root: "time",
+        root: testFilePath("time"),
         files: []
     };
     const timeFormat = {
@@ -66,13 +66,13 @@ describe("Build", () => {
         minute: "2-digit"
     };
     async function getTimeFiles() {
-        const minusYearFiles = await glob("time/-?/?/?/?/index.html");
-        const year1Files = await glob("time/?/index.html");
-        const year2Files = await glob("time/?/?/index.html");
-        const year3Files = await glob("time/?/?/?/index.html");
-        const year4Files = await glob("time/?/?/?/?/index.html");
-        const monthFiles = await glob("time/?/?/?/?/??/index.html");
-        const dayFiles = await glob("time/?/?/?/?/??/??/index.html");
+        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 = [
@@ -82,30 +82,29 @@ describe("Build", () => {
     ].map(testFilePath);
     getTimeFiles().then(async (timeFiles) => {
         const directoryOptions = {
-            root: "people/index.html",
-            scientists: "people/scientifiques.html",
-            ufologists: "people/ufologues.html",
-            ufoWitnesses: "people/witness/index.html",
-            astronomers: "people/astronomes.html",
-            contactees: "people/contactes.html",
-            pilots: "people/pilotes.html",
-            military: "people/militaires.html",
-            softwareEngineers: "tech/info/Personnes.html",
-            politicians: "people/politicians.html",
-            rulers: "people/dirigeants.html"
+            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")
         };
-        const sourceRegistryFileName = "source/index.json";
+        const sourceRegistryFileName = testFilePath("source/index.json");
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
         const build = new RR0Build({
             contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
             siteBaseUrl, timeFormat, timeFiles, directoryPages,
-            ufoCaseDirectoryFile: "science/crypto/ufo/enquete/dossier/index.html",
-            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"],
+            ufoCaseDirectoryFile: testFilePath("science/crypto/ufo/enquete/dossier/index.html"),
+            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(testFilePath),
             sourceRegistryFileName,
-            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"],
-            directoryOptions,
-            inDir: testFilePath
+            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(testFilePath),
+            directoryOptions
         });
         await build.run(args);
     });

package/dist/RR0ContentStep.d.ts

@@ -1,6 +1,6 @@
 import { ContentStep, ContentStepConfig, ContentStepResult, OutputFunc } from "ssg-api";
 import { HtmlRR0Context } from "./RR0Context.js";
-import { TimeContext } from "@rr0/time";
+import { TimeService } from "./time/index.js";
 export interface ContentVisitor {
     visit(context: HtmlRR0Context): Promise<void>;
 }
@@ -8,16 +8,20 @@ export interface FileVisitor {
     visit(context: HtmlRR0Context, processFile: boolean): Promise<void>;
     contentStepEnd(): Promise<void>;
 }
+export interface RR0ContentStepOptions {
+    contentConfigs: ContentStepConfig[];
+    outputFunc: OutputFunc;
+    fileVisitors?: FileVisitor[];
+    contentVisitors?: ContentVisitor[];
+    force: boolean;
+    name: string;
+    toProcess: Set<string>;
+}
 export declare class RR0ContentStep extends ContentStep<HtmlRR0Context> {
-    protected fileVisitors: FileVisitor[];
-    protected contentVisitors: ContentVisitor[];
-    protected force: boolean;
-    protected toProcess: Set<string>;
-    constructor(contentConfigs: ContentStepConfig[], outputFunc: OutputFunc, fileVisitors: FileVisitor[], contentVisitors: ContentVisitor[], force: boolean, name: string, toProcess: Set<string>);
-    static setTimeFromPath(context: HtmlRR0Context, filePath: string): TimeContext | undefined;
+    protected options: RR0ContentStepOptions;
+    protected timeService: TimeService;
+    constructor(options: RR0ContentStepOptions, timeService: TimeService);
     protected processFile(context: HtmlRR0Context, filePath: string, contentsConfig: ContentStepConfig): Promise<string | undefined>;
-    protected setContextFromFile(context: HtmlRR0Context, filePath: string): void;
-    protected setTimeFromPath(context: HtmlRR0Context, filePath: string): void;
     protected shouldProcessFile(context: HtmlRR0Context, contentsConfig: ContentStepConfig): Promise<boolean>;
     protected shouldProcessContent(context: HtmlRR0Context, contentsConfig: ContentStepConfig): Promise<boolean>;
     protected postExecute(result: ContentStepResult): Promise<ContentStepResult>;

package/dist/RR0ContentStep.js

@@ -1,54 +1,34 @@
 import { ContentStep } from "ssg-api";
-import { Time } from "./time/index.js";
 export class RR0ContentStep extends ContentStep {
-    constructor(contentConfigs, outputFunc, fileVisitors = [], contentVisitors = [], force, name, toProcess) {
-        super(contentConfigs, outputFunc, name);
-        this.fileVisitors = fileVisitors;
-        this.contentVisitors = contentVisitors;
-        this.force = force;
-        this.toProcess = toProcess;
-    }
-    static setTimeFromPath(context, filePath) {
-        const time = context.time;
-        time.reset();
-        const newTimeContext = Time.contextFromFileName(context, filePath);
-        if (newTimeContext) {
-            time.setYear(newTimeContext.getYear());
-            time.setMonth(newTimeContext.getMonth());
-            time.setDayOfMonth(newTimeContext.getDayOfMonth());
-            // context.time.from = context.time
-        }
-        return newTimeContext;
+    constructor(options, timeService) {
+        super(options.contentConfigs, options.outputFunc, options.name);
+        this.options = options;
+        this.timeService = timeService;
+        this.options.fileVisitors = options.fileVisitors || [];
+        this.options.contentVisitors = options.contentVisitors || [];
     }
     async processFile(context, filePath, contentsConfig) {
-        this.setContextFromFile(context, filePath);
+        this.timeService.setContextFromFile(context, filePath);
         return super.processFile(context, filePath, contentsConfig);
     }
-    setContextFromFile(context, filePath) {
-        this.setTimeFromPath(context, filePath);
-    }
-    setTimeFromPath(context, filePath) {
-        context.time.reset(); // Don't use time context from previous page.
-        RR0ContentStep.setTimeFromPath(context, filePath);
-    }
     async shouldProcessFile(context, contentsConfig) {
         const fileHasChanged = await super.shouldProcessFile(context, contentsConfig);
-        const fileIsForced = this.toProcess.has(context.file.name);
-        const processFile = this.force || fileIsForced || fileHasChanged;
+        const fileIsForced = this.options.toProcess.has(context.file.name);
+        const processFile = this.options.force || fileIsForced || fileHasChanged;
         if (processFile) {
-            this.toProcess.add(context.file.name);
+            this.options.toProcess.add(context.file.name);
         }
-        for (const fileVisitor of this.fileVisitors) {
+        for (const fileVisitor of this.options.fileVisitors) {
             await fileVisitor.visit(context, processFile);
         }
         return processFile;
     }
     async shouldProcessContent(context, contentsConfig) {
-        const fileIsForced = this.toProcess.has(context.file.name);
+        const fileIsForced = this.options.toProcess.has(context.file.name);
         const showProcess = await super.shouldProcessContent(context, contentsConfig);
-        const should = this.force || fileIsForced || showProcess;
+        const should = this.options.force || fileIsForced || showProcess;
         if (should) {
-            for (const contentVisitor of this.contentVisitors) {
+            for (const contentVisitor of this.options.contentVisitors) {
                 await contentVisitor.visit(context);
             }
         }
@@ -56,7 +36,7 @@ export class RR0ContentStep extends ContentStep {
     }
     async postExecute(result) {
         await super.postExecute(result);
-        for (const fileVisitor of this.fileVisitors) {
+        for (const fileVisitor of this.options.fileVisitors) {
             await fileVisitor.contentStepEnd();
         }
         return result;

package/dist/book/BookService.test.js

@@ -1,16 +1,16 @@
 import { ConsoleLogger } from "ssg-api";
 import { CLI } from "../util/cli/CLI.js";
 import path from "path";
-import { PeopleFactory, PeopleService } from "../people";
+import { PeopleService } from "../people";
 import { AllDataService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { BookService } from "./BookService";
 import { TimeUrlBuilder } from "../time";
-import { testFilePath } from "../test";
+import { rr0TestUtil, testFilePath } from "../test";
 const logger = new ConsoleLogger("rr0-books");
 const args = new CLI().getArgs();
 const fileName = args.import;
 const dry = args.dry === "true";
-const peopleFactory = new PeopleFactory(new RR0EventFactory());
+const peopleFactory = rr0TestUtil.peopleFactory;
 const eventFactory = new RR0EventFactory();
 const bookFactory = new TypedDataFactory(eventFactory, "book");
 const dataService = new AllDataService([bookFactory, peopleFactory]);
@@ -26,7 +26,8 @@ const timeOptions = {
 };
 const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeOptions.root });
 let files = [];
-const books = new BookService(logger, dry, new PeopleService(dataService, peopleFactory, files), timeUrlBuilder, config);
+const peopleService = new PeopleService(dataService, peopleFactory, files, rr0TestUtil.time.getService());
+const books = new BookService(logger, dry, peopleService, timeUrlBuilder, config);
 books.import(fileName).then((result) => {
     logger.log("Wrote", result.length, "books");
 });

package/dist/people/People.test.js

@@ -12,7 +12,7 @@ describe("People", () => {
         path.join(peopleRoot, "h/HynekJosefAllen"),
         path.join(peopleRoot, "v/VonBraunWerner")
     ];
-    const service = new PeopleService(new AllDataService([]), rr0TestUtil.peopleFactory, peopleFiles);
+    const service = new PeopleService(new AllDataService([]), rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
     test("age", async () => {
         const [hynek] = await service.getFromDir("HynekJosefAllen");
         expect(hynek.isDeceased()).toBe(false);

package/dist/people/PeopleFactory.test.js

@@ -14,7 +14,7 @@ describe("PeopleFactory", () => {
         path.join(peopleRoot, "h/HynekJosefAllen"),
         path.join(peopleRoot, "v/VonBraunWerner")
     ];
-    const factory = new PeopleService(dataService, rr0TestUtil.peopleFactory, peopleFiles);
+    const factory = new PeopleService(dataService, rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
     test("build people with one first name", () => {
         expect(factory.createFromFullName("Jérôme Beau")).toEqual(new People(["Jérôme"], "Beau", [], [], [], false, undefined, undefined, undefined, "people/b/BeauJerome"));
     });

package/dist/people/PeopleRegexReplaceCommand.test.js

@@ -8,7 +8,7 @@ describe("ClassDomReplaceCommand", () => {
     test("replaces", async () => {
         const peopleRoot = "src/people";
         const peopleFiles = [path.join(peopleRoot, "b/BeauJerome")];
-        const peopleService = new PeopleService(rr0TestUtil.dataService, rr0TestUtil.peopleFactory, peopleFiles);
+        const peopleService = new PeopleService(rr0TestUtil.dataService, rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
         const command = new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService), "people");
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", `<span class="people">Jérôme Beau</span>`);
         await command.execute(context);

package/dist/people/PeopleReplacer.test.js

@@ -22,7 +22,7 @@ describe("PeopleReplacer", () => {
     }
     test("ignore brackets", async () => {
         const dataService = new AllDataService([peopleFactory]);
-        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles));
+        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService()));
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
         {
             const lastnameFirstElement = createPeopleElement(context, "Hynek, Josef Allen (Northwestern University, Evanston, Illinois)");
@@ -37,7 +37,7 @@ describe("PeopleReplacer", () => {
     });
     test("replace people tags", async () => {
         const dataService = new AllDataService([peopleFactory]);
-        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles));
+        const replacer = new PeopleReplacer(new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService()));
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
         {
             const peopleWithTitle = createPeopleElement(context, "Ronald Reagan", "Ronald Wilson Reagan");

package/dist/people/PeopleService.d.ts

@@ -4,10 +4,12 @@ import { CountryCode } from "../org/index.js";
 import { Occupation } from "./Occupation.js";
 import { PeopleFactory } from "./PeopleFactory.js";
 import { AbstractDataService, AllDataService } from "@rr0/data";
+import { TimeService } from "../time";
 export declare class PeopleService extends AbstractDataService<People> {
     protected peopleFactory: PeopleFactory;
+    protected timeService: TimeService;
     readonly cache: Map<string, People>;
-    constructor(dataService: AllDataService, peopleFactory: PeopleFactory, files: string[]);
+    constructor(dataService: AllDataService, peopleFactory: PeopleFactory, files: string[], timeService: TimeService);
     createFromFullName(fullName: string): People;
     getAll(): Promise<People[]>;
     getFromDirs(dirNames: string[]): Promise<People[]>;

package/dist/people/PeopleService.js

@@ -1,12 +1,12 @@
 import { People } from "./People.js";
 import path from "path";
-import { Time } from "../time/Time.js";
 import { Gender } from "@rr0/common";
 import { AbstractDataFactory, AbstractDataService } from "@rr0/data";
 export class PeopleService extends AbstractDataService {
-    constructor(dataService, peopleFactory, files) {
+    constructor(dataService, peopleFactory, files, timeService) {
         super(dataService, peopleFactory, files);
         this.peopleFactory = peopleFactory;
+        this.timeService = timeService;
         this.cache = new Map();
     }
     createFromFullName(fullName) {
@@ -79,12 +79,12 @@ export class PeopleService extends AbstractDataService {
         }
         let birthTimeStr = people.birthTime;
         if (birthTimeStr) {
-            const birthTime = people.birthTime = Time.dateFromIso(birthTimeStr);
+            const birthTime = people.birthTime = this.timeService.dateFromIso(birthTimeStr);
             birthTimeStr = birthTime.getFullYear().toString();
         }
         let deathTimeStr = people.deathTime;
         if (deathTimeStr) {
-            const deathTime = people.deathTime = Time.dateFromIso(deathTimeStr);
+            const deathTime = people.deathTime = this.timeService.dateFromIso(deathTimeStr);
             deathTimeStr = deathTime.getFullYear().toString();
         }
         if (people.isDeceased()) {

package/dist/source/PersistentSourceRegistry.d.ts

@@ -2,12 +2,13 @@ import { HttpSource } from "../time/datasource/HttpSource.js";
 import { SourceRegistry } from "./SourceRegistry.js";
 import { AllDataService } from "@rr0/data";
 import { Source } from "@rr0/data/dist/source";
+import { TimeService } from "../time";
 /**
  * Create Source objects and register them.
  */
 export declare class PersistentSourceRegistry extends SourceRegistry {
     protected fileName: string;
-    constructor(dataService: AllDataService, http: HttpSource, baseUrl: string, fileName: string, options: Intl.DateTimeFormatOptions);
+    constructor(dataService: AllDataService, http: HttpSource, baseUrl: string, fileName: string, options: Intl.DateTimeFormatOptions, time: TimeService);
     protected get(href: string): Promise<Source>;
     protected register(href: string, source: Source): Promise<void>;
 }

package/dist/source/PersistentSourceRegistry.js

@@ -4,8 +4,8 @@ import { FileContents } from "@javarome/fileutil";
  * Create Source objects and register them.
  */
 export class PersistentSourceRegistry extends SourceRegistry {
-    constructor(dataService, http, baseUrl, fileName, options) {
-        super(dataService, http, baseUrl, options);
+    constructor(dataService, http, baseUrl, fileName, options, time) {
+        super(dataService, http, baseUrl, options, time);
         this.fileName = fileName;
         try {
             const registryFileContents = FileContents.read(fileName, "utf-8").contents;

package/dist/source/SourceFactory.d.ts

@@ -1,5 +1,6 @@
 import { HtmlRR0Context } from "../RR0Context.js";
 import { HttpSource } from "../time/datasource/HttpSource.js";
+import { TimeService } from "../time";
 import { AllDataService } from "@rr0/data";
 import { Source } from "@rr0/data/dist/source";
 /**
@@ -10,7 +11,8 @@ export declare class SourceFactory {
     protected http: HttpSource;
     protected baseUrl: string;
     protected options: Intl.DateTimeFormatOptions;
-    constructor(dataService: AllDataService, http: HttpSource, baseUrl: string, options: Intl.DateTimeFormatOptions);
+    protected time: TimeService;
+    constructor(dataService: AllDataService, http: HttpSource, baseUrl: string, options: Intl.DateTimeFormatOptions, time: TimeService);
     /**
      * Create a Source object from an anchor's URL.
      *

package/dist/source/SourceFactory.js

@@ -1,17 +1,17 @@
 import path from "path";
 import { TimeContext } from "@rr0/time";
 import { JSDOM } from "jsdom";
-import { Time } from "../time";
 import { FileContents } from "@javarome/fileutil";
 /**
  * Create Source objects.
  */
 export class SourceFactory {
-    constructor(dataService, http, baseUrl, options) {
+    constructor(dataService, http, baseUrl, options, time) {
         this.dataService = dataService;
         this.http = http;
         this.baseUrl = baseUrl;
         this.options = options;
+        this.time = time;
     }
     /**
      * Create a Source object from an anchor's URL.
@@ -65,7 +65,7 @@ export class SourceFactory {
         }
         const publication = source.publication;
         if (publication && !publication.time) {
-            publication.time = Time.contextFromFileName(context, href);
+            publication.time = this.time.contextFromFileName(context, href);
         }
         if (hash) {
             source.index = hash;

package/dist/source/SourceRegistry.d.ts

@@ -1,5 +1,5 @@
 import { HtmlRR0Context } from "../RR0Context.js";
-import { HttpSource } from "../time/index.js";
+import { HttpSource, TimeService } from "../time/index.js";
 import { SourceFactory } from "./SourceFactory.js";
 import { AllDataService } from "@rr0/data";
 import { Source } from "@rr0/data/dist/source";
@@ -8,7 +8,7 @@ import { Source } from "@rr0/data/dist/source";
  */
 export declare class SourceRegistry extends SourceFactory {
     registry: {};
-    constructor(dataService: AllDataService, http: HttpSource, baseUrl: string, options: Intl.DateTimeFormatOptions);
+    constructor(dataService: AllDataService, http: HttpSource, baseUrl: string, options: Intl.DateTimeFormatOptions, time: TimeService);
     /**
      * Create a Source object from an anchor's URL.
      *

package/dist/source/SourceRegistry.js

@@ -3,8 +3,8 @@ import { SourceFactory } from "./SourceFactory.js";
  * Create Source objects and register them.
  */
 export class SourceRegistry extends SourceFactory {
-    constructor(dataService, http, baseUrl, options) {
-        super(dataService, http, baseUrl, options);
+    constructor(dataService, http, baseUrl, options, time) {
+        super(dataService, http, baseUrl, options, time);
         this.registry = {};
     }
     /**

package/dist/test/RR0TestUtil.js

@@ -1,6 +1,5 @@
 import path from "path";
 import { RR0ContextImpl } from "../RR0Context.js";
-import { Time } from "../time/index.js";
 import { HtmlFileContents } from "ssg-api";
 import { OrganizationFactory } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
@@ -65,7 +64,7 @@ export class RR0TestUtil {
         const lang = currentFile.lang;
         context.file = new HtmlFileContents(currentFile.name, currentFile.encoding, currentFile.contents, currentFile.lastModified, lang, { author: [] }, {}, title);
         const htmlContext = context;
-        const timeContext = Time.contextFromFileName(htmlContext, inputFileName);
+        const timeContext = this.time.getService().contextFromFileName(htmlContext, inputFileName);
         Object.assign(htmlContext.time, timeContext);
         return htmlContext;
     }

package/dist/time/Time.d.ts

@@ -1,17 +1,2 @@
-import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
-import { TimeContext } from "@rr0/time";
-import { HtmlRR0Context } from "../RR0Context.js";
 export declare class Time {
-    static readonly timePathRegex: RegExp;
-    /**
-     * 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
-     */
-    static dateFromIso(isoDate: string): Date;
-    static parseFileName(fileName: string): RegExpExecArray | null;
-    static titleFromFile(context: HtmlRR0Context, fileName: string, timeTextBuilder: TimeTextBuilder): string | undefined;
-    static contextFromFileName(context: HtmlRR0Context, fileName?: string): TimeContext | undefined;
 }

package/dist/time/Time.js

@@ -1,59 +1,2 @@
-import { RR0ContextImpl } from "../RR0Context.js";
-import { StringUtil } from "../util/string/StringUtil.js";
 export class Time {
-    /**
-     * 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
-     */
-    static dateFromIso(isoDate) {
-        isoDate = isoDate.replace("~", "");
-        if (isoDate.charAt(0) === "-") {
-            isoDate = "-" + "0".repeat(7 - isoDate.length) + isoDate.substring(1);
-        }
-        return new Date(isoDate);
-    }
-    static parseFileName(fileName) {
-        return Time.timePathRegex.exec(fileName);
-    }
-    static titleFromFile(context, fileName, timeTextBuilder) {
-        let title;
-        const timeContext = Time.contextFromFileName(context, fileName);
-        if (timeContext) {
-            const pageContext = new RR0ContextImpl(context.locale, timeContext, context.config, context.people, context.file);
-            title = timeTextBuilder.build(pageContext);
-            title = StringUtil.capitalizeFirstLetter(title);
-        }
-        return title;
-    }
-    static contextFromFileName(context, fileName = context.file.name) {
-        let timeContext;
-        let elems;
-        if (fileName.endsWith("index.html")) {
-            while ((elems = fileName.split("/")).length < 6) {
-                fileName = elems.slice(0, elems.length - 1).join("/") + "/0/index.html";
-            }
-        }
-        const timeExec = Time.parseFileName(fileName);
-        if (timeExec && timeExec.length > 5) {
-            const pageContext = context.clone();
-            timeContext = pageContext.time;
-            const m = parseInt(timeExec[2], 10);
-            const c = parseInt(timeExec[3], 10);
-            const d = parseInt(timeExec[4], 10);
-            const u = parseInt(timeExec[5], 10);
-            const year = (timeExec[1] ? -1 : 1) * (m * 1000 + c * 100 + d * 10 + u);
-            timeContext.setYear(year);
-            const monthStr = timeExec[6];
-            timeContext.setMonth(monthStr ? parseInt(monthStr, 10) : undefined);
-            const dayStr = timeExec[7];
-            timeContext.setDayOfMonth(dayStr ? parseInt(dayStr, 10) : undefined);
-            timeContext.setHour(undefined);
-            timeContext.setMinutes(undefined);
-        }
-        return timeContext;
-    }
 }
-Time.timePathRegex = /time\/(-)?(\d)\/(\d)\/(\d)\/(\d)\/?(\d{2})?\/?(\d{2})?\/?(index(_[a-z]{2})?.html)?/;

package/dist/time/TimeEventRenderer.test.js

@@ -13,7 +13,7 @@ describe("TimeEventRenderer", () => {
     const dataService = new AllDataService([]);
     const baseUrl = "https://rr0.org";
     const http = new HttpSource();
-    const sourceFactory = new SourceFactory(dataService, http, baseUrl, rr0TestUtil.intlOptions);
+    const sourceFactory = new SourceFactory(dataService, http, baseUrl, rr0TestUtil.intlOptions, rr0TestUtil.time.getService());
     const renderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(rr0TestUtil.time.timeTextBuilder), rr0TestUtil.time.timeElementFactory);
     test("render event", async () => {
         const context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html");

package/dist/time/TimeLinkDefaultHandler.js

@@ -1,4 +1,3 @@
-import { Time } from "./Time.js";
 import { LinkType } from "ssg-api";
 export class TimeLinkDefaultHandler {
     constructor(service, timeTextBuilder) {
@@ -8,9 +7,10 @@ export class TimeLinkDefaultHandler {
     contents(context) {
         const prevLink = this.prev(context);
         if (prevLink) {
-            let contentUrl = this.service.matchExistingTimeFile(prevLink.url.substring(1));
-            if (contentUrl != this.service.root) {
-                const text = Time.titleFromFile(context, contentUrl, this.timeTextBuilder);
+            const service = this.service;
+            let contentUrl = service.matchExistingTimeFile(prevLink.url.substring(1));
+            if (contentUrl != service.root) {
+                const text = service.titleFromFile(context, contentUrl, this.timeTextBuilder);
                 if (text) {
                     return { type: LinkType.prev, text, url: "/" + contentUrl };
                 }
@@ -20,11 +20,12 @@ export class TimeLinkDefaultHandler {
     next(context) {
         let fileName = context.file.name;
         if (this.isTimeFile(fileName)) {
-            const pos = this.service.files.indexOf(fileName);
+            const service = this.service;
+            const pos = service.files.indexOf(fileName);
             if (pos >= 0) {
-                const nextFile = this.service.files[pos + 1];
+                const nextFile = service.files[pos + 1];
                 if (nextFile) {
-                    const text = Time.titleFromFile(context, nextFile, this.timeTextBuilder);
+                    const text = service.titleFromFile(context, nextFile, this.timeTextBuilder);
                     return { type: LinkType.next, text, url: "/" + nextFile };
                 }
             }
@@ -33,11 +34,12 @@ export class TimeLinkDefaultHandler {
     prev(context) {
         let fileName = context.file.name;
         if (this.isTimeFile(fileName)) {
-            const pos = this.service.files.indexOf(fileName);
+            const service = this.service;
+            const pos = service.files.indexOf(fileName);
             if (pos >= 0) {
-                const prevFile = this.service.files[pos - 1];
+                const prevFile = service.files[pos - 1];
                 if (prevFile) {
-                    const text = Time.titleFromFile(context, prevFile, this.timeTextBuilder);
+                    const text = service.titleFromFile(context, prevFile, this.timeTextBuilder);
                     if (text) {
                         return { type: LinkType.prev, text, url: "/" + prevFile };
                     }

package/dist/time/TimeService.d.ts

@@ -2,6 +2,8 @@ import { TimeRenderer } from "./html/TimeRenderer.js";
 import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
 import { TimeUrlBuilder } from "./TimeUrlBuilder";
 import { AbstractDataService, AllDataService, RR0Event } from "@rr0/data";
+import { HtmlRR0Context } from "../RR0Context";
+import { TimeContext } from "@rr0/time";
 export type TimeServiceOptions = {
     readonly root: string;
     readonly files: string[];
@@ -9,12 +11,28 @@ export type TimeServiceOptions = {
 export declare class TimeService extends AbstractDataService<RR0Event> {
     readonly textBuilder: TimeTextBuilder;
     readonly urlBuilder: TimeUrlBuilder;
+    readonly timePathRegex: RegExp;
+    static readonly defaultRegex: RegExp;
     readonly renderer: TimeRenderer;
     readonly root: string;
-    constructor(dataService: AllDataService, textBuilder: TimeTextBuilder, urlBuilder: TimeUrlBuilder, options: TimeServiceOptions);
+    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;
+    parseFileName(fileName: string): RegExpExecArray | null;
+    titleFromFile(context: HtmlRR0Context, fileName: string, timeTextBuilder: TimeTextBuilder): string | undefined;
+    contextFromFileName(context: HtmlRR0Context, fileName?: string): TimeContext | undefined;
+    gSetTimeFromPath(context: HtmlRR0Context, filePath: string): TimeContext | undefined;
+    setContextFromFile(context: HtmlRR0Context, filePath: string): void;
+    protected setTimeFromPath(context: HtmlRR0Context, filePath: string): void;
 }

package/dist/time/TimeService.js

@@ -1,10 +1,13 @@
 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) {
+    constructor(dataService, textBuilder, urlBuilder, options, timePathRegex = TimeService.defaultRegex) {
         super(dataService, null, options.files);
         this.textBuilder = textBuilder;
         this.urlBuilder = urlBuilder;
+        this.timePathRegex = timePathRegex;
         this.root = options.root;
         this.renderer = new TimeRenderer(this, this.textBuilder);
     }
@@ -21,4 +24,78 @@ export class TimeService extends AbstractDataService {
         }
         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);
+    }
+    titleFromFile(context, fileName, timeTextBuilder) {
+        let title;
+        const timeContext = this.contextFromFileName(context, fileName);
+        if (timeContext) {
+            const pageContext = new RR0ContextImpl(context.locale, timeContext, context.config, context.people, context.file);
+            title = timeTextBuilder.build(pageContext);
+            title = StringUtil.capitalizeFirstLetter(title);
+        }
+        return title;
+    }
+    contextFromFileName(context, fileName = context.file.name) {
+        let timeContext;
+        let elems;
+        if (fileName.endsWith("index.html")) {
+            while ((elems = fileName.split("/")).length < 6) {
+                fileName = elems.slice(0, elems.length - 1).join("/") + "/0/index.html";
+            }
+        }
+        const timeExec = this.parseFileName(fileName);
+        if (timeExec && timeExec.length > 5) {
+            const pageContext = context.clone();
+            timeContext = pageContext.time;
+            const m = parseInt(timeExec[2], 10);
+            const c = parseInt(timeExec[3], 10);
+            const d = parseInt(timeExec[4], 10);
+            const u = parseInt(timeExec[5], 10);
+            const year = (timeExec[1] ? -1 : 1) * (m * 1000 + c * 100 + d * 10 + u);
+            timeContext.setYear(year);
+            const monthStr = timeExec[6];
+            timeContext.setMonth(monthStr ? parseInt(monthStr, 10) : undefined);
+            const dayStr = timeExec[7];
+            timeContext.setDayOfMonth(dayStr ? parseInt(dayStr, 10) : undefined);
+            timeContext.setHour(undefined);
+            timeContext.setMinutes(undefined);
+        }
+        return timeContext;
+    }
+    gSetTimeFromPath(context, filePath) {
+        const time = context.time;
+        time.reset();
+        const newTimeContext = this.contextFromFileName(context, filePath);
+        if (newTimeContext) {
+            time.setYear(newTimeContext.getYear());
+            time.setMonth(newTimeContext.getMonth());
+            time.setDayOfMonth(newTimeContext.getDayOfMonth());
+            // context.time.from = context.time
+        }
+        return newTimeContext;
+    }
+    setContextFromFile(context, filePath) {
+        this.setTimeFromPath(context, filePath);
+    }
+    setTimeFromPath(context, filePath) {
+        context.time.reset(); // Don't use time context from previous page.
+        this.gSetTimeFromPath(context, filePath);
+    }
 }
+TimeService.defaultRegex = /time\/(-)?(\d)\/(\d)\/(\d)\/(\d)\/?(\d{2})?\/?(\d{2})?\/?(index(_[a-z]{2})?.html)?/;

package/dist/time/{Time.test.js → TimeService.test.js}

@@ -1,12 +1,12 @@
-import { Time } from "./Time.js";
 import { TimeContext } from "@rr0/time";
 import { RR0ContextImpl } from "../RR0Context.js";
 import { describe, expect, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../test/index.js";
 import { FileContents } from "@javarome/fileutil";
 describe("Time", () => {
+    const time = rr0TestUtil.time.getService();
     test("parse", () => {
-        const exec = Time.parseFileName("time/-0/0/1/1/index.html");
+        const exec = time.parseFileName("time/-0/0/1/1/index.html");
         let pos = 0;
         expect(exec[++pos]).toBe("-");
         expect(exec[++pos]).toBe("0");
@@ -23,23 +23,23 @@ describe("Time", () => {
         const context = new RR0ContextImpl("fr", timeContext, config);
         test("recognize year before 0 AD", () => {
             context.file = new FileContents("time/-0/0/1/1/index.html", "utf-8", "", new Date("2012-08-12"), { lang: "fr", variants: [] });
-            const newTimeContext = Time.contextFromFileName(context);
+            const newTimeContext = time.contextFromFileName(context);
             expect(newTimeContext.getYear()).toBe(-11);
         });
         test("recognize year after 0 AD", () => {
             context.file = new FileContents("time/1/9/7/2/index.html", "utf-8", "", new Date("2012-08-12"), { lang: "fr", variants: [] });
-            const newTimeContext = Time.contextFromFileName(context);
+            const newTimeContext = time.contextFromFileName(context);
             expect(newTimeContext.getYear()).toBe(1972);
         });
         test("recognize month", () => {
             context.file = new FileContents("time/1/9/7/2/08/index.html", "utf-8", "", new Date("2012-08-12"), { lang: "fr", variants: [] });
-            const newTimeContext = Time.contextFromFileName(context);
+            const newTimeContext = time.contextFromFileName(context);
             expect(newTimeContext.getYear()).toBe(1972);
             expect(newTimeContext.getMonth()).toBe(8);
         });
         test("recognize day", () => {
             context.file = new FileContents("time/1/9/7/2/08/12/index.html", "utf-8", "", new Date("2012-08-12"), { lang: "fr", variants: [] });
-            const newTimeContext = Time.contextFromFileName(context);
+            const newTimeContext = time.contextFromFileName(context);
             expect(newTimeContext.getYear()).toBe(1972);
             expect(newTimeContext.getMonth()).toBe(8);
             expect(newTimeContext.getDayOfMonth()).toBe(12);

package/dist/time/TitleReplaceCommand.test.js

@@ -1,12 +1,11 @@
 import { SsiTitleReplaceCommand } from "./SsiTitleReplaceCommand.js";
 import { rr0TestUtil } from "../test/index.js";
 import { describe, expect, test } from "@javarome/testscript";
-import { Time } from "./Time.js";
 describe("TitleReplaceCommand", () => {
     let timeTextBuilder = rr0TestUtil.time.timeTextBuilder;
     const timeDefaultHandler = (context) => {
         let title;
-        title = Time.titleFromFile(context, context.file.name, timeTextBuilder);
+        title = rr0TestUtil.time.getService().titleFromFile(context, context.file.name, timeTextBuilder);
         return title;
     };
     describe("Time page", () => {

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

@@ -15,11 +15,12 @@ describe("ChronologyReplacer", () => {
         const dataService = new AllDataService([]);
         const baseUrl = "https://rr0.org";
         const http = new HttpSource();
-        const sourceFactory = new SourceFactory(dataService, http, baseUrl, rr0TestUtil.intlOptions);
+        const timeTestUtil = rr0TestUtil.time;
+        const sourceFactory = new SourceFactory(dataService, http, baseUrl, rr0TestUtil.intlOptions, timeTestUtil.getService());
         const timeTextBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
-        const caseRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(timeTextBuilder), rr0TestUtil.time.timeElementFactory);
+        const caseRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(timeTextBuilder), timeTestUtil.timeElementFactory);
         chronologyReplacer = new ChronologyReplacer([urecatRR0Mapping], caseRenderer);
-        context = rr0TestUtil.time.newHtmlContext("index.html");
+        context = timeTestUtil.newHtmlContext("index.html");
         context.time.setYear(undefined);
         //    context.time.setMonth(3)
     });

package/dist/time/datasource/DatasourceTestCase.js

@@ -41,8 +41,8 @@ export class DatasourceTestCase {
         const dataService = new AllDataService([]);
         const baseUrl = "https://rr0.org";
         const http = new HttpSource();
-        const sourceFactory = new SourceFactory(dataService, http, baseUrl, this.intlOptions);
         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 eventRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(this.timeTextBuilder), timeElementFactory);
         const items = [];

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.1.20",
+  "version": "0.1.22",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -34,7 +34,7 @@
     "@rr0/place": "^0.3.2",
     "@rr0/data": "^0.1.2",
     "@javarome/fileutil": "^0.3.6",
-    "ssg-api": "^1.16.11",
+    "ssg-api": "^1.16.12",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",
     "glob": "^11.0.0",