@rr0/cms 0.1.14 → 0.1.16

package/dist/BaseReplaceCommand.d.ts

@@ -1,10 +1,10 @@
 import { DomReplaceCommand, DomReplacer } from "ssg-api";
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
+import { HtmlRR0Context } from "./RR0Context.js";
 /**
  * Enforce a constant host value for the <base> tag
  */
 export declare class BaseReplaceCommand extends DomReplaceCommand {
     protected baseUrl: string;
     constructor(baseUrl: string);
-    protected createReplacer(context: HtmlRR0SsgContext): Promise<DomReplacer>;
+    protected createReplacer(context: HtmlRR0Context): Promise<DomReplacer>;
 }

package/dist/DefaultContentVisitor.d.ts

@@ -1,7 +1,7 @@
 import { AllDataService } from "./data/AllDataService.js";
-import { TimeElementFactory } from "./time/TimeElementFactory.js";
+import { TimeElementFactory } from "./time/html/TimeElementFactory.js";
 import { ContentVisitor } from "./RR0ContentStep.js";
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
+import { HtmlRR0Context } from "./RR0Context.js";
 import { RR0Data } from "./data/RR0Data.js";
 import { EventRenderer } from "./time/EventRenderer.js";
 import { RR0Event } from "./event/RR0Event.js";
@@ -10,16 +10,16 @@ export declare class DefaultContentVisitor implements ContentVisitor {
     protected eventRenderer: EventRenderer<RR0Event>;
     protected timeElementFactory: TimeElementFactory;
     constructor(service: AllDataService, eventRenderer: EventRenderer<RR0Event>, timeElementFactory: TimeElementFactory);
-    visit(context: HtmlRR0SsgContext): Promise<void>;
-    protected process(context: HtmlRR0SsgContext, data: RR0Data): Promise<void>;
-    protected timeParagraph(context: HtmlRR0SsgContext, event: RR0Data): {
+    visit(context: HtmlRR0Context): Promise<void>;
+    protected process(context: HtmlRR0Context, data: RR0Data): Promise<void>;
+    protected timeParagraph(context: HtmlRR0Context, event: RR0Data): {
         eventP: HTMLParagraphElement;
         timeEl: HTMLElement;
     };
-    protected processImage(context: HtmlRR0SsgContext, imageData: RR0Data): Promise<void>;
-    protected processBirth(context: HtmlRR0SsgContext, event: RR0Data, entity: RR0Data): Promise<void>;
-    protected processDeath(context: HtmlRR0SsgContext, event: RR0Event, entity: RR0Data): Promise<void>;
-    protected processBook(context: HtmlRR0SsgContext, bookData: RR0Data): Promise<void>;
-    protected processTitle(context: HtmlRR0SsgContext, data: RR0Data): void;
-    protected processURL(context: HtmlRR0SsgContext, data: RR0Data): void;
+    protected processImage(context: HtmlRR0Context, imageData: RR0Data): Promise<void>;
+    protected processBirth(context: HtmlRR0Context, event: RR0Data, entity: RR0Data): Promise<void>;
+    protected processDeath(context: HtmlRR0Context, event: RR0Event, entity: RR0Data): Promise<void>;
+    protected processBook(context: HtmlRR0Context, bookData: RR0Data): Promise<void>;
+    protected processTitle(context: HtmlRR0Context, data: RR0Data): void;
+    protected processURL(context: HtmlRR0Context, data: RR0Data): void;
 }

package/dist/DescriptionReplaceCommand.d.ts

@@ -1,12 +1,12 @@
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
+import { HtmlRR0Context } from "./RR0Context.js";
 import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
 /**
  * Adds an "abstract" HTML paragraph from a <meta name="description">, if any.
  */
-export declare class DescriptionReplaceCommand implements ReplaceCommand<HtmlRR0SsgContext> {
+export declare class DescriptionReplaceCommand implements ReplaceCommand<HtmlRR0Context> {
     protected readonly defaultDescription: string;
     protected readonly abstractClass: string;
     constructor(defaultDescription: string, abstractClass?: string);
-    execute(context: HtmlRR0SsgContext): Promise<void>;
+    execute(context: HtmlRR0Context): Promise<void>;
     contentStepEnd(): Promise<void>;
 }

package/dist/ImageCommand.d.ts

@@ -1,5 +1,5 @@
 import { DomReplaceCommand, DomReplacer } from "ssg-api";
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
+import { HtmlRR0Context } from "./RR0Context.js";
 /**
  * Register images (`<img>` tags) required in an HTML file.
  */
@@ -9,7 +9,7 @@ export declare class ImageCommand extends DomReplaceCommand<HTMLImageElement> {
     protected maxHeight: number;
     protected baseUrl: string;
     constructor(outBaseDir: string, maxWidth: number, maxHeight: number, baseUrl?: string);
-    protected createReplacer(context: HtmlRR0SsgContext): Promise<DomReplacer<HTMLImageElement>>;
-    protected postExecute(context: HtmlRR0SsgContext): Promise<void>;
+    protected createReplacer(context: HtmlRR0Context): Promise<DomReplacer<HTMLImageElement>>;
+    protected postExecute(context: HtmlRR0Context): Promise<void>;
     private handleImage;
 }

package/dist/MetaLinkReplaceCommand.d.ts

@@ -1,5 +1,5 @@
 import { HtmlSsgContext, Link, ReplaceCommand } from "ssg-api";
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
+import { HtmlRR0Context } from "./RR0Context.js";
 export interface LinkHandler<C extends HtmlSsgContext> {
     start(context: C): Link | undefined;
     contents(context: C): Link | undefined;
@@ -9,10 +9,10 @@ export interface LinkHandler<C extends HtmlSsgContext> {
 /**
  * Convert meta <link> to HTML <nav> links.
  */
-export declare class MetaLinkReplaceCommand<C extends HtmlRR0SsgContext = HtmlRR0SsgContext> implements ReplaceCommand<C> {
+export declare class MetaLinkReplaceCommand<C extends HtmlRR0Context = HtmlRR0Context> implements ReplaceCommand<C> {
     protected defaultHandler?: LinkHandler<C>;
     constructor(defaultHandler?: LinkHandler<C>);
     execute(context: C): Promise<void>;
     contentStepEnd(): Promise<void>;
-    protected linkItem(context: HtmlRR0SsgContext, link: Link): HTMLLIElement;
+    protected linkItem(context: HtmlRR0Context, link: Link): HTMLLIElement;
 }

package/dist/OpenGraphCommand.d.ts

@@ -1,11 +1,11 @@
 import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
+import { HtmlRR0Context } from "./RR0Context.js";
 import { Canvas, CanvasRenderingContext2D } from "canvas";
 import { TimeTextBuilder } from "./time/index.js";
 /**
  * Create a preview image for each page sharing.
  */
-export declare class OpenGraphCommand implements ReplaceCommand<HtmlRR0SsgContext> {
+export declare class OpenGraphCommand implements ReplaceCommand<HtmlRR0Context> {
     protected outDir: string;
     protected timeFiles: string[];
     protected baseUrl: string;
@@ -14,8 +14,8 @@ export declare class OpenGraphCommand implements ReplaceCommand<HtmlRR0SsgContex
     protected height: number;
     protected num: number;
     constructor(outDir: string, timeFiles: string[], baseUrl: string, timeTextBuilder: TimeTextBuilder, width?: number, height?: number);
-    execute(context: HtmlRR0SsgContext): Promise<void>;
-    getInfoStr(context: HtmlRR0SsgContext): string;
+    execute(context: HtmlRR0Context): Promise<void>;
+    getInfoStr(context: HtmlRR0Context): string;
     contentStepEnd(): Promise<void>;
     /**
      * Draw text on the canvas, with line returns when required.
@@ -46,6 +46,6 @@ export declare class OpenGraphCommand implements ReplaceCommand<HtmlRR0SsgContex
      * @param dy
      * @protected
      */
-    protected drawImage(context: HtmlRR0SsgContext, canvasCtx: CanvasRenderingContext2D, dy?: number): Promise<number>;
-    protected writeImageFile(context: HtmlRR0SsgContext, canvas: Canvas): string;
+    protected drawImage(context: HtmlRR0Context, canvasCtx: CanvasRenderingContext2D, dy?: number): Promise<number>;
+    protected writeImageFile(context: HtmlRR0Context, canvas: Canvas): string;
 }

package/dist/OpenGraphCommand.js

@@ -56,7 +56,7 @@ export class OpenGraphCommand {
                 context.time.setDayOfMonth(timeContext.getDayOfMonth());
                 context.time.setHour(undefined);
                 context.time.setMinutes(undefined);
-                timeStr = this.timeTextBuilder.build(context);
+                timeStr = this.timeTextBuilder.build(context, true);
             }
         }
         const copyrightStr = context.file.meta.copyright || "RR0.org";

package/dist/RR0ContentStep.d.ts

@@ -1,24 +1,24 @@
 import { ContentStep, ContentStepConfig, ContentStepResult, OutputFunc } from "ssg-api";
-import { HtmlRR0SsgContext } from "./RR0SsgContext.js";
-import { TimeContext } from "./time/index.js";
+import { HtmlRR0Context } from "./RR0Context.js";
+import { TimeContext } from "@rr0/time";
 export interface ContentVisitor {
-    visit(context: HtmlRR0SsgContext): Promise<void>;
+    visit(context: HtmlRR0Context): Promise<void>;
 }
 export interface FileVisitor {
-    visit(context: HtmlRR0SsgContext, processFile: boolean): Promise<void>;
+    visit(context: HtmlRR0Context, processFile: boolean): Promise<void>;
     contentStepEnd(): Promise<void>;
 }
-export declare class RR0ContentStep extends ContentStep<HtmlRR0SsgContext> {
+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: HtmlRR0SsgContext, filePath: string): TimeContext | undefined;
-    protected processFile(context: HtmlRR0SsgContext, filePath: string, contentsConfig: ContentStepConfig): Promise<string | undefined>;
-    protected setContextFromFile(context: HtmlRR0SsgContext, filePath: string): void;
-    protected setTimeFromPath(context: HtmlRR0SsgContext, filePath: string): void;
-    protected shouldProcessFile(context: HtmlRR0SsgContext, contentsConfig: ContentStepConfig): Promise<boolean>;
-    protected shouldProcessContent(context: HtmlRR0SsgContext, contentsConfig: ContentStepConfig): Promise<boolean>;
+    static setTimeFromPath(context: HtmlRR0Context, filePath: string): TimeContext | undefined;
+    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,5 +1,5 @@
 import { ContentStep } from "ssg-api";
-import { TimeContext } from "./time/index.js";
+import { Time } from "./time/index.js";
 export class RR0ContentStep extends ContentStep {
     constructor(contentConfigs, outputFunc, fileVisitors = [], contentVisitors = [], force, name, toProcess) {
         super(contentConfigs, outputFunc, name);
@@ -11,7 +11,7 @@ export class RR0ContentStep extends ContentStep {
     static setTimeFromPath(context, filePath) {
         const time = context.time;
         time.reset();
-        const newTimeContext = TimeContext.fromFileName(context, filePath);
+        const newTimeContext = Time.contextFromFileName(context, filePath);
         if (newTimeContext) {
             time.setYear(newTimeContext.getYear());
             time.setMonth(newTimeContext.getMonth());

package/dist/{RR0SsgContext.d.ts → RR0Context.d.ts}

@@ -1,28 +1,28 @@
-import { TimeContext } from "./time/index.js";
 import { RR0Messages } from "./lang/index.js";
 import { FileContents, HtmlSsgContext, SsgConfig, SsgContext, SsgContextImpl } from "ssg-api";
 import { People } from "./people/People.js";
-export interface RR0SsgContext extends SsgContext {
+import { TimeContext } from "@rr0/time";
+export interface RR0Context extends SsgContext {
     readonly messages: RR0Messages;
     readonly time: TimeContext;
-    clone(locale?: string): RR0SsgContext;
+    clone(locale?: string): RR0Context;
 }
-export interface HtmlRR0SsgContext extends HtmlSsgContext {
+export interface HtmlRR0Context extends HtmlSsgContext {
     readonly messages: RR0Messages;
     time: TimeContext;
     people: People;
     readonly images: Set<string>;
     readonly config: SsgConfig;
-    clone(locale?: string): HtmlRR0SsgContext;
+    clone(locale?: string): HtmlRR0Context;
 }
-export declare class RR0SsgContextImpl extends SsgContextImpl {
+export declare class RR0ContextImpl extends SsgContextImpl {
     readonly time: TimeContext;
     readonly config: SsgConfig;
     readonly people: any;
     readonly messages: RR0Messages;
     readonly images: Set<string>;
     protected readonly fileMap: Map<string, FileContents>;
-    constructor(locale: string, time: TimeContext, config: SsgConfig, people?: any, currentFile?: FileContents | undefined);
+    constructor(locale: string, time: TimeContext, config: SsgConfig, people?: any, currentFile?: FileContents | undefined, messages?: RR0Messages);
     read(filePath: string): FileContents;
-    clone(locale?: string): RR0SsgContextImpl;
+    clone(locale?: string): RR0ContextImpl;
 }

package/dist/{RR0SsgContext.js → RR0Context.js}

@@ -1,14 +1,14 @@
 import { ssgMessages } from "./lang/index.js";
 import { ConsoleLogger, SsgContextImpl } from "ssg-api";
-export class RR0SsgContextImpl extends SsgContextImpl {
-    constructor(locale, time, config, people = undefined, currentFile = undefined) {
+export class RR0ContextImpl extends SsgContextImpl {
+    constructor(locale, time, config, people = undefined, currentFile = undefined, messages = ssgMessages[locale]) {
         super(locale, new Map(), "RR0", new ConsoleLogger("RR0"), currentFile);
         this.time = time;
         this.config = config;
         this.people = people;
+        this.messages = messages;
         this.images = new Set();
         this.fileMap = new Map();
-        this.messages = ssgMessages[locale];
     }
     read(filePath) {
         let file = this.fileMap.get(filePath);
@@ -24,6 +24,6 @@ export class RR0SsgContextImpl extends SsgContextImpl {
     }
     clone(locale = this.locale) {
         var _a;
-        return new RR0SsgContextImpl(locale, this.time.clone(), this.config, (_a = this.people) === null || _a === void 0 ? void 0 : _a.clone(), this._file);
+        return new RR0ContextImpl(locale, this.time.clone(), this.config, (_a = this.people) === null || _a === void 0 ? void 0 : _a.clone(), this._file);
     }
 }

package/dist/anchor/AnchorHandler.d.ts

@@ -1,4 +1,4 @@
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 export interface AnchorHandler {
-    handle(context: HtmlRR0SsgContext, a: HTMLAnchorElement, pathToSearch: string): Promise<void>;
+    handle(context: HtmlRR0Context, a: HTMLAnchorElement, pathToSearch: string): Promise<void>;
 }

package/dist/anchor/AnchorReplaceCommand.d.ts

@@ -1,6 +1,6 @@
 import { DomReplaceCommand, DomReplacer } from "ssg-api";
 import { AnchorReplacer } from "./AnchorReplacer.js";
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 import { AnchorHandler } from "./AnchorHandler.js";
 /**
  * Contextual replacement of anchors (`<a>` tags).
@@ -8,5 +8,5 @@ import { AnchorHandler } from "./AnchorHandler.js";
 export declare class AnchorReplaceCommand extends DomReplaceCommand<HTMLAnchorElement> {
     protected readonly singleton: AnchorReplacer;
     constructor(baseUrl: string, handlers: AnchorHandler[]);
-    protected createReplacer(context: HtmlRR0SsgContext): Promise<DomReplacer<HTMLAnchorElement>>;
+    protected createReplacer(context: HtmlRR0Context): Promise<DomReplacer<HTMLAnchorElement>>;
 }

package/dist/anchor/AnchorReplacer.d.ts

@@ -1,11 +1,11 @@
 import { HtmlSsgContext } from "ssg-api";
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 import { AnchorHandler } from "./AnchorHandler.js";
 export declare class AnchorReplacer {
     protected handlers: AnchorHandler[];
     protected readonly baseUrl: string;
     constructor(baseUrl: string, handlers: AnchorHandler[]);
-    replacement(context: HtmlRR0SsgContext, a: HTMLAnchorElement): Promise<HTMLAnchorElement>;
+    replacement(context: HtmlRR0Context, a: HTMLAnchorElement): Promise<HTMLAnchorElement>;
     /**
      * Update a link to denote it as external.
      *
@@ -14,5 +14,5 @@ export declare class AnchorReplacer {
      * @protected
      */
     protected updateLinkExternal(context: HtmlSsgContext, a: HTMLAnchorElement): void;
-    protected updateLinkInternal(context: HtmlRR0SsgContext, a: HTMLAnchorElement, url: URL): Promise<void>;
+    protected updateLinkInternal(context: HtmlRR0Context, a: HTMLAnchorElement, url: URL): Promise<void>;
 }

package/dist/anchor/CaseAnchorHandler.d.ts

@@ -1,10 +1,10 @@
 import { AnchorHandler } from "./AnchorHandler.js";
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 import { TimeTextBuilder } from "../time/index.js";
 import { CaseService } from "../science/crypto/ufo/enquete/dossier/CaseService.js";
 export declare class CaseAnchorHandler implements AnchorHandler {
     protected caseService: CaseService;
     protected timeTextBuilder: TimeTextBuilder;
     constructor(caseService: CaseService, timeTextBuilder: TimeTextBuilder);
-    handle(context: HtmlRR0SsgContext, link: HTMLAnchorElement, pathToSearch: string): Promise<void>;
+    handle(context: HtmlRR0Context, link: HTMLAnchorElement, pathToSearch: string): Promise<void>;
 }

package/dist/anchor/CaseAnchorHandler.js

@@ -1,5 +1,5 @@
-import { TimeContext } from "../time/index.js";
 import path from "path";
+import { TimeContext } from "@rr0/time";
 export class CaseAnchorHandler {
     constructor(caseService, timeTextBuilder) {
         this.caseService = caseService;
@@ -31,7 +31,7 @@ export class CaseAnchorHandler {
                     else if (!titles.includes(timeStr)) {
                         caseContext.time.updateFromStr(timeStr);
                     }
-                    titles.push(this.timeTextBuilder.build(caseContext));
+                    titles.push(this.timeTextBuilder.build(caseContext, true));
                 }
                 const place = aCase.place;
                 if (typeof place === "string" && !titles.includes(place)) {

package/dist/anchor/DataAnchorHandler.d.ts

@@ -1,5 +1,5 @@
 import { AnchorHandler } from "./AnchorHandler.js";
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 import { AllDataService } from "../data/AllDataService.js";
 import { RR0Data } from "../data/RR0Data.js";
 export declare class DataAnchorHandler implements AnchorHandler {
@@ -9,9 +9,9 @@ export declare class DataAnchorHandler implements AnchorHandler {
      */
     protected number: number;
     constructor(dataService: AllDataService);
-    handle(context: HtmlRR0SsgContext, linkEl: HTMLAnchorElement, pathToSearch: string): Promise<void>;
-    protected handleNote(context: HtmlRR0SsgContext, linkEl: HTMLAnchorElement, note: string): void;
-    protected handleApi(context: HtmlRR0SsgContext, data: RR0Data, linkEl: HTMLAnchorElement): void;
-    protected handleProduct(context: HtmlRR0SsgContext, data: RR0Data, linkEl: HTMLAnchorElement): void;
-    protected handleOrg(context: HtmlRR0SsgContext, data: RR0Data, linkEl: HTMLAnchorElement): void;
+    handle(context: HtmlRR0Context, linkEl: HTMLAnchorElement, pathToSearch: string): Promise<void>;
+    protected handleNote(context: HtmlRR0Context, linkEl: HTMLAnchorElement, note: string): void;
+    protected handleApi(context: HtmlRR0Context, data: RR0Data, linkEl: HTMLAnchorElement): void;
+    protected handleProduct(context: HtmlRR0Context, data: RR0Data, linkEl: HTMLAnchorElement): void;
+    protected handleOrg(context: HtmlRR0Context, data: RR0Data, linkEl: HTMLAnchorElement): void;
 }

package/dist/book/BookContentVisitor.d.ts

@@ -1,9 +1,9 @@
 import { ContentVisitor } from "RR0ContentStep.js";
 import { HtmlLinks, HtmlMeta } from "ssg-api";
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 export declare class BookContentVisitor implements ContentVisitor {
     protected bookMeta: Map<string, HtmlMeta>;
     protected bookLinks: Map<string, HtmlLinks>;
     constructor(bookMeta: Map<string, HtmlMeta>, bookLinks: Map<string, HtmlLinks>);
-    visit(context: HtmlRR0SsgContext): Promise<void>;
+    visit(context: HtmlRR0Context): Promise<void>;
 }

package/dist/book/BookDirectoryStep.d.ts

@@ -1,4 +1,4 @@
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 import { DirectoryStep, HtmlLinks, HtmlMeta, OutputFunc, SsgConfig } from "ssg-api";
 import { Book } from "./Book.js";
 /**
@@ -10,8 +10,8 @@ export declare class BookDirectoryStep extends DirectoryStep {
     protected bookLinks: Map<string, HtmlLinks>;
     constructor(rootDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: SsgConfig, name: string, bookMeta: Map<string, HtmlMeta>, bookLinks: Map<string, HtmlLinks>);
     static create(outputFunc: OutputFunc, config: SsgConfig, bookMeta: Map<string, HtmlMeta>, bookLinks: Map<string, HtmlLinks>): Promise<BookDirectoryStep>;
-    protected processDirs(context: HtmlRR0SsgContext, dirNames: string[]): Promise<void>;
-    protected scan(context: HtmlRR0SsgContext, dirNames: string[]): Book[];
+    protected processDirs(context: HtmlRR0Context, dirNames: string[]): Promise<void>;
+    protected scan(context: HtmlRR0Context, dirNames: string[]): Book[];
     /**
      * Convert an array of Case[] to an <ul> HTML unordered list.
      *
@@ -24,6 +24,6 @@ export declare class BookDirectoryStep extends DirectoryStep {
      * @param dirBook
      */
     protected toListItem(dirBook: Book): string;
-    protected tocAll(context: HtmlRR0SsgContext, books: Book[]): Promise<void>;
-    protected toc(context: HtmlRR0SsgContext, book: Book): Promise<void>;
+    protected tocAll(context: HtmlRR0Context, books: Book[]): Promise<void>;
+    protected toc(context: HtmlRR0Context, book: Book): Promise<void>;
 }

package/dist/book/BookService.d.ts

@@ -2,14 +2,16 @@ import { Logger, SsgConfig } from "ssg-api";
 import { Book } from "./Book.js";
 import { People } from "../people/People.js";
 import { PeopleService } from "../people/PeopleService.js";
+import { TimeUrlBuilder } from "../time";
 export declare class BookService {
     readonly logger: Logger;
     protected dry: boolean;
     protected peopleService: PeopleService;
+    protected timeUrlBuilder: TimeUrlBuilder;
     protected config: SsgConfig;
     protected readonly intlOptions: Intl.DateTimeFormatOptions;
     protected peopleList: People[];
-    constructor(logger: Logger, dry: boolean, peopleService: PeopleService, config: SsgConfig);
+    constructor(logger: Logger, dry: boolean, peopleService: PeopleService, timeUrlBuilder: TimeUrlBuilder, config: SsgConfig);
     import(fileName: string): Promise<Book[]>;
     protected findPeople(fullName: string): Promise<People | undefined>;
 }

package/dist/book/BookService.js

@@ -1,15 +1,15 @@
 import * as fs from "fs";
 import { FileUtil } from "ssg-api";
-import { TimeContext } from "../time/TimeContext.js";
-import { TimeUrlBuilder } from "../time/TimeUrlBuilder.js";
+import { TimeContext } from "@rr0/time";
 import * as path from "path";
 import { StringUtil } from "../util/string/StringUtil.js";
 import { CSVFileReader } from "../CSVFileReader.js";
 export class BookService {
-    constructor(logger, dry, peopleService, config) {
+    constructor(logger, dry, peopleService, timeUrlBuilder, config) {
         this.logger = logger;
         this.dry = dry;
         this.peopleService = peopleService;
+        this.timeUrlBuilder = timeUrlBuilder;
         this.config = config;
         this.intlOptions = {
             year: "numeric",
@@ -67,7 +67,7 @@ export class BookService {
                         authorsStr = authorsStr.substring(0, authorsStr.length - andAl.length - 1) + andAl;
                     }
                 } while (dirName.length >= 255);
-                const parentDir = TimeUrlBuilder.fromContext(time);
+                const parentDir = this.timeUrlBuilder.fromContext(time);
                 const bookDir = path.join(parentDir, dirName);
                 const id = result[COLUMN_ISBN];
                 const book = {

package/dist/book/Chapters.d.ts

@@ -1,9 +1,9 @@
-import { HtmlRR0SsgContext } from "RR0SsgContext.js";
+import { HtmlRR0Context } from "RR0Context.js";
 export declare class Chapter {
     protected startFileName: string;
-    readonly context: HtmlRR0SsgContext;
+    readonly context: HtmlRR0Context;
     subs: Chapter[];
-    constructor(parentContext: HtmlRR0SsgContext, startFileName: string);
+    constructor(parentContext: HtmlRR0Context, startFileName: string);
     scan(): Promise<void>;
     toString(prefix?: string): string;
     update(parent?: Chapter): Promise<void>;

package/dist/book/Chapters.js

@@ -71,7 +71,7 @@ ${this.subs.map(subFile => subFile.toString("  " + prefix)).join("")}`;
 const args = new CLI().getArgs();
 const startFileName = args.start;
 
-const context = new RR0SsgContextImpl('fr', new TimeContext({
+const context = new RR0ContextImpl('fr', new TimeContext({
     year: 'numeric',
     month: 'long',
     day: 'numeric',
@@ -89,7 +89,7 @@ for (const variant of variants) {
   startFileNames.push(variantFileName);
 }
 for (const startFileName of startFileNames) {
-  const chapter = new Chapter(context as unknown as HtmlRR0SsgContext, startFileName);
+  const chapter = new Chapter(context as unknown as HtmlRR0Context, startFileName);
   chapter.scan().then(async () => {
     console.log('*** Before:\n', chapter.toString());
     await chapter.update();

package/dist/build.js

@@ -1,8 +1,8 @@
-import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, Time, TimeContext, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder } from "./time";
+import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, Time, 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";
-import { RR0SsgContextImpl } from "./RR0SsgContext.js";
+import { RR0ContextImpl } from "./RR0Context.js";
 import { CLI, HtmlTable } from "./util/index.js";
 import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, FileContents, FileUtil, HtAccessToNetlifyConfigReplaceCommand, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
 import { LanguageReplaceCommand } from "./lang/index.js";
@@ -28,6 +28,8 @@ import { DefaultContentVisitor } from "./DefaultContentVisitor.js";
 import { RR0EventFactory } from "./event/index.js";
 import fs from "fs";
 import { rr0DefaultCopyright } from "./RR0DefaultCopyright.js";
+import { glob } from "glob";
+import { TimeContext } from "@rr0/time";
 console.time("ssg");
 let args = new CLI().getArgs();
 const configFile = args.config;
@@ -96,7 +98,7 @@ const timeFormat = {
     minute: "2-digit"
 };
 const timeContext = new TimeContext();
-const context = new RR0SsgContextImpl("fr", timeContext, config);
+const context = new RR0ContextImpl("fr", timeContext, config);
 context.setVar("mail", "rr0@rr0.org");
 const siteBaseUrl = "https://rr0.org/";
 const eventFactory = new RR0EventFactory();
@@ -111,9 +113,13 @@ const dataService = new AllDataService([orgFactory, caseFactory, peopleFactory,
 dataService.getFromDir("", ["people", "case"]).then(data => {
     console.debug(data);
 });
+const timeOptions = {
+    root: "src/time",
+    files: []
+};
 const timeTextBuilder = new TimeTextBuilder(timeFormat);
-const timeService = new TimeService(dataService, timeTextBuilder);
-const peopleService = new PeopleService(dataService, peopleFactory);
+const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeOptions.root });
+const timeService = new TimeService(dataService, timeTextBuilder, timeUrlBuilder, timeOptions);
 const googleMapsApiKey = process.env.GOOGLE_MAPS_API_KEY;
 if (!googleMapsApiKey) {
     throw Error("GOOGLE_MAPS_API_KEY is required");
@@ -121,11 +127,24 @@ if (!googleMapsApiKey) {
 context.setVar("mapsApiKey", googleMapsApiKey);
 const placeService = new GooglePlaceService("place", googleMapsApiKey);
 const orgService = new OrganizationService([], "org", undefined);
-timeService.getFiles().then(async (timeFiles) => {
+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");
+    return year1Files.concat(year2Files).concat(year3Files).concat(year4Files).concat(minusYearFiles).concat(monthFiles).concat(dayFiles).sort();
+}
+getTimeFiles().then(async (timeFiles) => {
     context.setVar("timeFilesCount", timeFiles.length);
     const timeElementFactory = new TimeElementFactory(timeService.renderer);
-    const caseService = new CaseService(dataService, caseFactory, timeElementFactory);
     const timeReplacer = new TimeReplacer(timeElementFactory);
+    const caseFiles = await caseFactory.getFiles();
+    const caseService = new CaseService(dataService, caseFactory, timeElementFactory, caseFiles);
+    const peopleFiles = await peopleFactory.getFiles();
+    const peopleService = new PeopleService(dataService, peopleFactory, peopleFiles);
     const peopleList = await peopleService.getAll();
     context.setVar("peopleFilesCount", peopleList.length);
     const bookMeta = new Map();
@@ -194,7 +213,7 @@ timeService.getFiles().then(async (timeFiles) => {
         new ClassDomReplaceCommand(noteReplacerFactory, "note"),
         new ClassDomReplaceCommand(new IndexedReplacerFactory(), "indexed"),
         new UnitReplaceCommand(),
-        new MetaLinkReplaceCommand(new TimeLinkDefaultHandler(timeFiles, timeTextBuilder)),
+        new MetaLinkReplaceCommand(new TimeLinkDefaultHandler(timeService, timeTextBuilder)),
         databaseAggregationCommand
     ];
     const ssg = new Ssg(config);

package/dist/data/AbstractDataFactory.d.ts

@@ -1,7 +1,8 @@
 import { RR0Data } from "./RR0Data.js";
-import { TimeContext } from "../time/index.js";
 import { RR0DataFactory } from "./RR0DataFactory.js";
-import { RR0Event, RR0EventFactory } from "../event/index.js";
+import { RR0EventFactory } from "../event/RR0EventFactory.js";
+import { RR0Event } from "../event/RR0Event.js";
+import { TimeContext } from "@rr0/time";
 export declare class AbstractDataFactory<T extends RR0Data> implements RR0DataFactory<T> {
     protected eventFactory: RR0EventFactory;
     static readonly defaultImageFileNames: string[];

package/dist/data/AbstractDataFactory.js

@@ -1,6 +1,6 @@
-import { TimeContext } from "../time/index.js";
 import path from "path";
 import fs from "fs";
+import { TimeContext } from "@rr0/time";
 export class AbstractDataFactory {
     /**
      * @param eventFactory The factory to create sub-events.

package/dist/data/AbstractDataService.d.ts

@@ -5,9 +5,8 @@ import { RR0Case } from "../science/crypto/ufo/enquete/dossier/RR0Case.js";
 export declare abstract class AbstractDataService<T extends RR0Data> {
     protected readonly dataService: AllDataService;
     protected factory: TypedDataFactory<T>;
-    protected files: string[];
-    protected constructor(dataService: AllDataService, factory: TypedDataFactory<T>);
+    readonly files: string[];
+    protected constructor(dataService: AllDataService, factory: TypedDataFactory<T>, files: string[]);
     get type(): string;
     get(path: string): Promise<RR0Case[] | undefined>;
-    getFiles(): Promise<string[]>;
 }

package/dist/data/AbstractDataService.js

@@ -1,8 +1,8 @@
-import { RR0FileUtil } from "../util/file/RR0FileUtil.js";
 export class AbstractDataService {
-    constructor(dataService, factory) {
+    constructor(dataService, factory, files) {
         this.dataService = dataService;
         this.factory = factory;
+        this.files = files;
     }
     get type() {
         return this.factory.type;
@@ -10,10 +10,4 @@ export class AbstractDataService {
     async get(path) {
         return this.dataService.getFromDir(path, [this.type, undefined], [this.type + ".json"]);
     }
-    async getFiles() {
-        if (!this.files) {
-            this.files = RR0FileUtil.findDirectoriesContaining(this.factory.fileNames[0] + ".json", "out");
-        }
-        return this.files;
-    }
 }