@rr0/cms 0.3.16 → 0.3.17

package/dist/test/RR0TestUtil.d.ts

@@ -5,8 +5,8 @@ import { CaseFactory } from "../science/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
 import { AllDataService, PeopleFactory } from "@rr0/data";
 import { CountryService } from "../org/country/CountryService";
-import { BuildContext } from "../BuildContext";
-export declare class RR0TestUtil implements BuildContext {
+import { CMSContext } from "../CMSContext";
+export declare class RR0TestUtil implements CMSContext {
     readonly rootDir: string;
     readonly outDir: string;
     readonly config: FileWriteConfig;

package/dist/test/RR0TestUtil.js

@@ -28,7 +28,7 @@ export class RR0TestUtil {
             timeZoneName: "short"
         };
         const eventFactory = new RR0EventFactory();
-        const sightingFactory = new EventDataFactory(eventFactory, "sighting", ["index"]);
+        const sightingFactory = new EventDataFactory(eventFactory, ["sighting"], ["index"]);
         const orgFactory = this.orgFactory = new CmsOrganizationFactory(eventFactory);
         this.orgService = new OrganizationService([], "org", orgFactory, undefined);
         this.caseFactory = new CaseFactory(eventFactory);

package/dist/time/SsiTitleReplaceCommand.d.ts

@@ -6,6 +6,10 @@ import { HtmlRR0Context } from "../RR0Context.js";
  */
 export declare class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
     protected defaultHandlers: StringContextHandler[];
+    /**
+     * @param defaultHandlers Will generate a title for a given context/file, if no title is found.
+     */
     constructor(defaultHandlers?: StringContextHandler[]);
     protected createReplacer(context: HtmlRR0Context): Promise<RegexReplacer>;
+    protected getTitle(context: HtmlRR0Context): string;
 }

package/dist/time/SsiTitleReplaceCommand.js

@@ -4,6 +4,9 @@ import { SsiEchoVarReplaceCommand } from "ssg-api";
  * with a link if there's a <meta name="url"> content.
  */
 export class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
+    /**
+     * @param defaultHandlers Will generate a title for a given context/file, if no title is found.
+     */
     constructor(defaultHandlers = []) {
         super("title");
         this.defaultHandlers = defaultHandlers;
@@ -11,18 +14,20 @@ export class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
     async createReplacer(context) {
         return {
             replace: (_match, ..._args) => {
-                const inputFile = context.file;
-                let title = inputFile.title;
-                if (!title) {
-                    this.defaultHandlers.some(handle => !title && (title = handle(context)));
-                }
-                if (!title) {
-                    title = inputFile.name;
-                }
-                inputFile.title = title;
-                const titleUrl = inputFile.meta.url;
-                return titleUrl ? `<a href="${titleUrl}" target="_blank">${title}</a>` : title;
+                context.file.title = this.getTitle(context);
+                const titleUrl = context.file.meta.url;
+                return titleUrl ? `<a href="${titleUrl}" target="_blank">${(this.getTitle(context))}</a>` : this.getTitle(context);
             }
         };
     }
+    getTitle(context) {
+        let title = context.file.title;
+        if (!title) {
+            this.defaultHandlers.some(handle => !title && (title = handle(context)));
+        }
+        if (!title) {
+            title = context.file.name;
+        }
+        return title;
+    }
 }

package/dist/time/TimeDirectoryStep.d.ts

@@ -0,0 +1,46 @@
+import { DirectoryStep, FileWriteConfig, OutputFunc } from "ssg-api";
+import { TimeService } from "./TimeService.js";
+import { HtmlRR0Context, RR0Context } from "../RR0Context";
+import { RR0Event } from "@rr0/data";
+import { TimeElementFactory } from "./html";
+/**
+ * Builds a directory page for UFO times.
+ */
+export declare class TimeDirectoryStep extends DirectoryStep {
+    protected service: TimeService;
+    protected elementFactory: TimeElementFactory;
+    protected outputFunc: OutputFunc;
+    /**
+     *
+     * @param service
+     * @param elementFactory
+     * @param rootDirs The directories where UFO times info can be found.
+     * @param excludedDirs The directories to exclude from the UFO time directory search.
+     * @param templateFileName The template of the directory page to build.
+     * @param outputFunc
+     * @param config
+     */
+    constructor(service: TimeService, elementFactory: TimeElementFactory, rootDirs: string[], excludedDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: FileWriteConfig);
+    /**
+     * Convert an array of Time[] to an <ul> HTML unordered list.
+     *
+     * @param context
+     * @param events
+     */
+    protected toList(context: HtmlRR0Context, events: RR0Event[]): HTMLUListElement;
+    /**
+     * Convert a Time object to an HTML list item.
+     *
+     * @param context
+     * @param event
+     */
+    protected toListItem(context: HtmlRR0Context, event: RR0Event): HTMLLIElement;
+    protected processDirs(context: HtmlRR0Context, dirNames: string[]): Promise<void>;
+    /**
+     * Read time JSON files contents and instantiate them as Time objects.
+     *
+     * @param context
+     * @param dirNames The directories to look for time.json files.
+     */
+    protected scan(context: RR0Context, dirNames: string[]): Promise<RR0Event[]>;
+}

package/dist/time/TimeDirectoryStep.js

@@ -0,0 +1,88 @@
+import { DirectoryStep } from "ssg-api";
+import { StringUtil } from "../util";
+/**
+ * Builds a directory page for UFO times.
+ */
+export class TimeDirectoryStep extends DirectoryStep {
+    /**
+     *
+     * @param service
+     * @param elementFactory
+     * @param rootDirs The directories where UFO times info can be found.
+     * @param excludedDirs The directories to exclude from the UFO time directory search.
+     * @param templateFileName The template of the directory page to build.
+     * @param outputFunc
+     * @param config
+     */
+    constructor(service, elementFactory, rootDirs, excludedDirs, templateFileName, outputFunc, config) {
+        super({ rootDirs, excludedDirs, templateFileName, getOutputPath: config.getOutputPath }, "time directory");
+        this.service = service;
+        this.elementFactory = elementFactory;
+        this.outputFunc = outputFunc;
+    }
+    /**
+     * Convert an array of Time[] to an <ul> HTML unordered list.
+     *
+     * @param context
+     * @param events
+     */
+    toList(context, events) {
+        const listItems = events.map(event => {
+            if (!event.title) {
+                const lastSlash = event.dirName.lastIndexOf("/");
+                const lastDir = event.dirName.substring(lastSlash + 1);
+                event.title = StringUtil.camelToText(lastDir);
+            }
+            return this.toListItem(context, event);
+        });
+        const ul = context.file.document.createElement("ul");
+        ul.append(...listItems);
+        ul.className = "links";
+        return ul;
+    }
+    /**
+     * Convert a Time object to an HTML list item.
+     *
+     * @param context
+     * @param event
+     */
+    toListItem(context, event) {
+        const item = context.file.document.createElement("li");
+        const eventContext = context.clone();
+        this.service.setContextFromFile(eventContext, event.dirName);
+        if (event.time) {
+            eventContext.time.date = event.time;
+        }
+        const ref = this.elementFactory.create(eventContext, context, { url: true, contentOnly: true });
+        item.appendChild(ref);
+        return item;
+    }
+    async processDirs(context, dirNames) {
+        const events = await this.scan(context, dirNames);
+        const ul = this.toList(context, events);
+        const outputPath = this.config.getOutputPath(context);
+        const output = context.newOutput(outputPath);
+        output.contents = context.file.contents.replace(`<!--#echo var="directories" -->`, ul.outerHTML);
+        await this.outputFunc(context, output);
+    }
+    /**
+     * Read time JSON files contents and instantiate them as Time objects.
+     *
+     * @param context
+     * @param dirNames The directories to look for time.json files.
+     */
+    async scan(context, dirNames) {
+        const events = [];
+        for (const dirName of dirNames) {
+            try {
+                const dirEvents = await this.service.get(dirName);
+                events.push(...dirEvents);
+            }
+            catch (e) {
+                context.warn(`${dirName} has no event.json description`);
+                // No json, just guess title.
+            }
+        }
+        return events;
+    }
+}

package/dist/time/TimeDirectoryStep.test.js

@@ -0,0 +1,36 @@
+import { describe, expect, test } from "@javarome/testscript";
+import { TimeDirectoryStep } from "./TimeDirectoryStep.js";
+import { rr0TestUtil, testFilePath } from "../test";
+import { getTimeFiles } from "../CMSGenerator.test";
+import path from "path";
+import { TimeService } from "./TimeService";
+import { AllDataService, RR0EventFactory } from "@rr0/data";
+import { TimeElementFactory } from "./html";
+describe("TimeDirectoryStep", () => {
+    async function outputFunc(context, info, outDir = rr0TestUtil.outDir + "/") {
+        info.name = `${outDir}${info.name}`;
+    }
+    test("directory", async () => {
+        const template = `
+<!--#include virtual="/header-start.html" -->
+<title>16ème siècle</title>
+<!--#include virtual="/header-end.html" -->
+<p>Before</p>
+<!--#echo var="directories" -->
+<p>Le XVIIIᵉ siècle est celui des "Lumières".</p>
+<!--#include virtual="/footer.html" -->
+`;
+        const timeRoot = rr0TestUtil.time.timeOptions.rootDir;
+        const timeOptions = { rootDir: timeRoot, files: await getTimeFiles() };
+        const dataService = new AllDataService([new RR0EventFactory()]);
+        const timeService = new TimeService(dataService, timeOptions);
+        const timesDirectoryPath = testFilePath("time/0/0/6/5/index.html");
+        const context = rr0TestUtil.newContext(timesDirectoryPath, template);
+        const ufoTimesExclusions = [];
+        const timeDirs = timeService.files.map(timePath => path.dirname(timePath));
+        const timeElementFactory = new TimeElementFactory(rr0TestUtil.time.timeRenderer);
+        const step = new TimeDirectoryStep(timeService, timeElementFactory, timeDirs, ufoTimesExclusions, timesDirectoryPath, outputFunc, rr0TestUtil.config);
+        const stepResult = await step.execute(context);
+        expect(stepResult.directoryCount).toBe(22);
+    });
+});

package/dist/time/TimeService.d.ts

@@ -11,7 +11,5 @@ export declare class TimeService extends AbstractDataService<RR0Event, RR0EventJ
     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;
+    setContextFromFile(context: HtmlRR0Context, filePath: string): TimeContext | undefined;
 }

package/dist/time/TimeService.js

@@ -1,9 +1,9 @@
-import { AbstractDataService } from "@rr0/data";
+import { AbstractDataService, EventDataFactory, RR0EventFactory } from "@rr0/data";
 import { RR0ContextImpl } from "../RR0Context";
 import { StringUtil } from "../util";
 export class TimeService extends AbstractDataService {
     constructor(dataService, options, timePathRegex = TimeService.defaultRegex) {
-        super(dataService, null, options.files);
+        super(dataService, new EventDataFactory(new RR0EventFactory(), ["birth", "death", "image", "book", "article", "sighting", "nationality", "move", "occupation"], options.files), options.files);
         this.options = options;
         this.timePathRegex = timePathRegex;
     }
@@ -14,7 +14,7 @@ export class TimeService extends AbstractDataService {
         let title;
         const timeContext = this.contextFromFileName(context, fileName);
         if (timeContext) {
-            const pageContext = new RR0ContextImpl(context.locale, timeContext, context.config, context.people, context.file);
+            const pageContext = new RR0ContextImpl(context.locale, timeContext, context.config, context.people, context.file, context.messages, context.cms);
             title = timeTextBuilder.build(pageContext);
             title = StringUtil.capitalizeFirstLetter(title);
         }
@@ -47,7 +47,7 @@ export class TimeService extends AbstractDataService {
         }
         return timeContext;
     }
-    gSetTimeFromPath(context, filePath) {
+    setContextFromFile(context, filePath) {
         const time = context.time;
         time.reset();
         const newTimeContext = this.contextFromFileName(context, filePath);
@@ -59,12 +59,5 @@ export class TimeService extends AbstractDataService {
         }
         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/datasource/CsvFileSource.d.ts

@@ -15,5 +15,5 @@ export declare class CsvFileSource<S> extends FileSource {
      * @protected
      */
     fileName(context: HtmlSsgContext, datasource: Datasource<S>): string;
-    write(context: HtmlRR0Context, datasourceCases: S[], fetchTime: Date, datasource: Datasource<any>): void;
+    write(context: HtmlRR0Context, datasourceCases: S[], fetchTime: Date, datasource: Datasource<any>): string;
 }

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

@@ -4,17 +4,19 @@ export declare class CsvMapper<S> implements CaseMapper<RR0Context, S, string> {
     readonly sep: string;
     readonly escapeStr: string;
     readonly prefix: string;
+    protected maxLevel: number;
     readonly fields: Set<string>;
-    constructor(sep?: string, escapeStr?: string, prefix?: string);
-    readonly fieldMapper: (context: RR0Context, key: string, value: any, sourceTime: Date) => string;
+    constructor(sep?: string, escapeStr?: string, prefix?: string, maxLevel?: number);
+    readonly fieldMapper: (context: RR0Context, key: string, value: any, sourceTime: Date, level?: number) => string;
     /**
      * Map a case to a CSV row.
      *
      * @param context
      * @param sourceCase
      * @param sourceTime
+     * @param level
      */
-    map(context: RR0Context, sourceCase: S, sourceTime: Date): string;
+    map(context: RR0Context, sourceCase: S, sourceTime: Date, level?: number): string;
     /**
      * Reduce a set of cases to a CSV string.
      *

package/dist/time/datasource/CsvMapper.js

@@ -1,11 +1,12 @@
 import { Level2Date as EdtfDate } from "@rr0/time";
 export class CsvMapper {
-    constructor(sep = ",", escapeStr = "\"", prefix = "") {
+    constructor(sep = ",", escapeStr = "\"", prefix = "", maxLevel = 1) {
         this.sep = sep;
         this.escapeStr = escapeStr;
         this.prefix = prefix;
+        this.maxLevel = maxLevel;
         this.fields = new Set();
-        this.fieldMapper = (context, key, value, sourceTime) => {
+        this.fieldMapper = (context, key, value, sourceTime, level = 0) => {
             let addField = true;
             let val;
             if (value instanceof Date) {
@@ -18,17 +19,19 @@ export class CsvMapper {
                 val = value.toString();
             }
             else if (Array.isArray(value)) {
-                val = this.escape(value.map((item, i) => this.fieldMapper(context, String(i), item, sourceTime)).join(this.sep), true);
+                val = this.escape(value.map((item, i) => this.fieldMapper(context, String(i), item, sourceTime, level + 1)).join(this.sep), true);
             }
             else if (typeof value === "object") {
-                const subMapper = new CsvMapper(this.sep, this.escapeStr, this.prefix + key + ".");
-                const subValues = subMapper.map(context, value, sourceTime);
-                let addSubFields = !isFinite(key);
-                if (addSubFields) {
-                    subMapper.fields.forEach(subField => this.fields.add(subField));
+                if (level <= this.maxLevel) {
+                    const subMapper = new CsvMapper(this.sep, this.escapeStr, this.prefix + key + ".", level);
+                    const subValues = subMapper.map(context, value, sourceTime, level + 1);
+                    let addSubFields = !isFinite(key);
+                    if (addSubFields) {
+                        subMapper.fields.forEach(subField => this.fields.add(subField));
+                    }
+                    val = subValues;
                 }
                 addField = false;
-                val = subValues;
             }
             else {
                 val = value;
@@ -45,10 +48,12 @@ export class CsvMapper {
      * @param context
      * @param sourceCase
      * @param sourceTime
+     * @param level
      */
-    map(context, sourceCase, sourceTime) {
-        const entries = Array.from(Object.entries(sourceCase)).sort((entry1, entry2) => entry1[0].localeCompare(entry2[0]));
-        return entries.map(entry => this.fieldMapper(context, entry[0], entry[1], sourceTime)).join(this.sep);
+    map(context, sourceCase, sourceTime, level = 0) {
+        const sourceCaseEntries = Object.entries(sourceCase);
+        const entries = Array.from(sourceCaseEntries).sort((entry1, entry2) => entry1[0].localeCompare(entry2[0]));
+        return entries.map(entry => this.fieldMapper(context, entry[0], entry[1], sourceTime, level)).join(this.sep);
     }
     /**
      * Reduce a set of cases to a CSV string.

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

@@ -32,6 +32,35 @@ describe("CsvMapper", () => {
                 .join("\n");
         expect(csvContents).toBe(expectedCsv);
     });
+    describe("mapper", () => {
+        const date = new Date("2025-01-01");
+        const context = rr0TestUtil.newHtmlContext("time/1/9/7/0/03/index.html");
+        test("string", () => {
+            const mapper = new CsvMapper(";");
+            expect(mapper.fieldMapper(context, "key1", "val1", date)).toBe("val1");
+            expect(Array.from(mapper.fields)).toEqual(["key1"]);
+        });
+        describe("object", () => {
+            test("level 0", () => {
+                const mapper = new CsvMapper(";");
+                const csvLine = mapper.fieldMapper(context, "obj1", { prop1: "propVal1", prop2: 12 }, date);
+                expect(Array.from(mapper.fields)).toEqual(["obj1.prop1", "obj1.prop2"]);
+                expect(csvLine).toBe("propVal1;12");
+            });
+            test("level 1", () => {
+                const mapper = new CsvMapper(";");
+                const csvLine = mapper.fieldMapper(context, "obj1", { prop1: "propVal1", prop2: 12, prop3: { prop31: "prop31Val" } }, date);
+                expect(Array.from(mapper.fields)).toEqual(["obj1.prop1", "obj1.prop2", "obj1.prop3.prop31"]);
+                expect(csvLine).toBe("propVal1;12;prop31Val");
+            });
+            test("level 2", () => {
+                const mapper = new CsvMapper(";");
+                const csvLine = mapper.fieldMapper(context, "obj1", { prop1: "propVal1", prop2: 12, prop3: { prop31: "prop31Val", prop4: { key4: "value4" } } }, date);
+                expect(Array.from(mapper.fields)).toEqual(["obj1.prop1", "obj1.prop2", "obj1.prop3.prop31"]);
+                expect(csvLine).toBe("propVal1;12;prop31Val");
+            });
+        });
+    });
     test("read", () => {
         const fileMapper = new CsvMapper(";");
         const fileName = path.join(process.cwd(), geipanFileDatasource.defaultFileName);

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

@@ -14,5 +14,5 @@ export declare class FileSource {
      */
     fileName(context: HtmlSsgContext, datasource: Datasource<any>): string;
     read(context: HtmlSsgContext, datasource: Datasource<any>): Promise<FileContents>;
-    writeContents(context: HtmlSsgContext, contents: string | NodeJS.ArrayBufferView, datasource: Datasource<any>): void;
+    writeContents(context: HtmlSsgContext, contents: string | NodeJS.ArrayBufferView, datasource: Datasource<any>): string;
 }

package/dist/time/datasource/FileSource.js

@@ -23,6 +23,7 @@ export class FileSource {
     writeContents(context, contents, datasource) {
         const fileName = this.fileName(context, datasource);
         fs.writeFileSync(fileName, contents, { encoding: this.encoding });
+        return fileName;
     }
 }
 FileSource.specialChars = /[ \-?!&*#().:\/\\;=°',]/g;

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

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

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

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

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

@@ -3,12 +3,12 @@ import { NuforcHttpDatasource } from "./NuforcHttpDatasource.js";
 import { RR0CaseMapping } from "../rr0";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
 import { NuforcCaseSummary } from "./NuforcCaseSummary";
-import { BuildContext } from "../../../BuildContext";
+import { CMSContext } from "../../../CMSContext";
 export declare const nuforcDatasource: NuforcHttpDatasource;
 export declare class NuforcRR0Mapping implements RR0CaseMapping<NuforcCaseSummary> {
     readonly actions: ChronologyReplacerActions;
     datasource: NuforcHttpDatasource;
     mapper: NuforcRR0Mapper;
     constructor(actions: ChronologyReplacerActions);
-    init(build: BuildContext): this;
+    init(build: CMSContext): this;
 }

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

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

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

@@ -1,10 +1,7 @@
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { AbstractDatasource } from "../AbstractDatasource.js";
-import { TimeContextFilter } from "../TimeContextFilter.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
 import { Place } from "@rr0/place";
-export declare class RR0ContextFilter extends TimeContextFilter<RR0CaseSummary> {
-}
 export declare abstract class RR0Datasource extends AbstractDatasource<RR0CaseSummary> {
     static idCount: number;
     static readonly placeRegex: RegExp;

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

@@ -1,15 +1,12 @@
 import { AbstractDatasource } from "../AbstractDatasource.js";
-import { TimeContextFilter } from "../TimeContextFilter.js";
-export class RR0ContextFilter extends TimeContextFilter {
-}
+import { StringUtil } from "../../../util";
 export class RR0Datasource extends AbstractDatasource {
     constructor() {
         super(["Beau, Jérôme"], "RR0");
     }
     static id(dateTime, place) {
-        var _a;
-        return `${(dateTime === null || dateTime === void 0 ? void 0 : dateTime.toString()) || ("rr0-" + ++this.idCount)}$${((_a = place === null || place === void 0 ? void 0 : place.toString()) !== null && _a !== void 0 ? _a : "")}`;
+        return `${(dateTime === null || dateTime === void 0 ? void 0 : dateTime.toString()) || ("rr0-" + ++this.idCount)}$${(place ? StringUtil.textToCamel(place.toString()) : "")}`;
     }
 }
 RR0Datasource.idCount = 0;
-RR0Datasource.placeRegex = /^(.+?)(?:\s*\((.+?)(?:\s*,\s*(.+?)(?:\s*,\s*(.+?)))?\))?$/g;
+RR0Datasource.placeRegex = /^(.+?)(?:\s*\((.+?)(?:\s*,\s*(.+?)\s*,\s*(.+?))?\))?$/g;

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

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

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

@@ -25,11 +25,13 @@ export class RR0TestMapping {
     }
     init(build) {
         this.mapper = new RR0CaseSummaryMapper(new URL("https://rr0.org"), "time", ["Beau, Jérôme"]);
-        this.backupDatasource = new RR0FileDatasource(this.mapper);
+        this.backupDatasource = new class extends RR0FileDatasource {
+        }(this.mapper);
         return this;
     }
 }
 describe("RR0CaseSource", () => {
+    const rr0TestMapping = new RR0TestMapping({ read: ["fetch"], write: [] });
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);
@@ -72,7 +74,7 @@ describe("RR0CaseSource", () => {
                 return " " + HtmlTag.toString("span", authorStr + sourceItems.join(", "), { class: "source" });
             }).join("");
         }
-    }(new RR0TestMapping({ read: ["fetch"], write: [] }).init(rr0TestUtil), rr0TestCases);
+    }(rr0TestMapping.init(rr0TestUtil), rr0TestCases);
     let context;
     beforeEach(() => {
         context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html");

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

@@ -9,6 +9,6 @@ export declare class RR0FileDatasource extends RR0Datasource implements Datasour
     protected mapper: CaseMapper<RR0Context, RR0CaseSummary, RR0CaseSummary>;
     protected readonly file: CsvFileSource<unknown>;
     constructor(mapper: CaseMapper<RR0Context, RR0CaseSummary, RR0CaseSummary>);
-    save(context: HtmlRR0Context, fetched: any[], fetchTime: Date): void;
+    save(context: HtmlRR0Context, fetched: any[], fetchTime: Date): string;
     protected readCases(context: HtmlRR0Context): Promise<RR0CaseSummary[]>;
 }

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

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

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

@@ -0,0 +1,14 @@
+import { describe, expect, test } from "@javarome/testscript";
+import { rr0TestUtil } from "../../../test/index.js";
+import { rr0TestCases } from "./RR0TestCases.js";
+import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper";
+import { RR0FileDatasource } from "./RR0FileDatasource";
+describe("RR0FileDatasource", () => {
+    test("save", async () => {
+        const csvMapper = new RR0CaseSummaryMapper(new URL("https://rr0.org"), "time", ["Beau, Jérôme"]);
+        const datasource = new RR0FileDatasource(csvMapper);
+        const context = rr0TestUtil.newHtmlContext("time/1/9/7/0/03/index.html");
+        const fileName = datasource.save(context, rr0TestCases, new Date("2025-01-01"));
+        expect(fileName).toBe("test/time/1/9/7/0/03/BeauJerome_RR0.csv");
+    });
+});

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

@@ -4,7 +4,7 @@ import { RR0CaseMapping } from "./RR0CaseMapping.js";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";
 import { RR0Datasource } from "./RR0Datasource";
-import { BuildContext } from "../../../BuildContext";
+import { CMSContext } from "../../../CMSContext";
 export declare class RR0Mapping implements RR0CaseMapping<RR0CaseSummary> {
     readonly actions: ChronologyReplacerActions;
     static baseUrl: URL;
@@ -13,5 +13,5 @@ export declare class RR0Mapping implements RR0CaseMapping<RR0CaseSummary> {
     backupDatasource: RR0FileDatasource;
     mapper: RR0CaseSummaryMapper;
     constructor(actions: ChronologyReplacerActions);
-    init(build: BuildContext): this;
+    init(build: CMSContext): this;
 }