@rr0/cms 0.3.16 → 0.3.19

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.js";
+import { RR0Event } from "@rr0/data";
+import { TimeElementFactory } from "./html/index.js";
+/**
+ * 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,89 @@
+import { DirectoryStep } from "ssg-api";
+import { StringUtil } from "../util/index.js";
+/**
+ * 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 config = this.config;
+        const outputPath = 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 } from "../test/index.js";
+import { getTimeFiles } from "../CMSGenerator.test.js";
+import path from "path";
+import { TimeService } from "./TimeService.js";
+import { AllDataService, RR0EventFactory } from "@rr0/data";
+import { TimeElementFactory } from "./html/index.js";
+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 = rr0TestUtil.filePath("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/TimeEventRenderer.test.js

@@ -8,9 +8,9 @@ import { NoteFileCounter, NoteRenderer } from "../note/index.js";
 import { HautsDeSeineCityCode } from "../org/eu/fr/region/idf/92/HautsDeSeineCityCode.js";
 import { AllDataService } from "@rr0/data";
 import { Place } from "@rr0/place";
-import { OrganizationPlace } from "../place/OrganizationPlace";
-import { hautsDeSeine } from "../org/eu/fr/region/idf/92/HautsDeSeine";
-import { City } from "../org";
+import { OrganizationPlace } from "../place/OrganizationPlace.js";
+import { hautsDeSeine } from "../org/eu/fr/region/idf/92/HautsDeSeine.js";
+import { City } from "../org/country/region/department/city/City.js";
 describe("TimeEventRenderer", () => {
     const dataService = new AllDataService([]);
     const baseUrl = "https://rr0.org";

package/dist/time/TimeLinkDefaultHandler.d.ts

@@ -2,8 +2,8 @@ import { LinkHandler } from "../MetaLinkReplaceCommand.js";
 import { HtmlRR0Context } from "../RR0Context.js";
 import { Link } from "ssg-api";
 import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
-import { TimeService } from "./TimeService";
-import { TimeUrlBuilder } from "./TimeUrlBuilder";
+import { TimeService } from "./TimeService.js";
+import { TimeUrlBuilder } from "./TimeUrlBuilder.js";
 export declare class TimeLinkDefaultHandler implements LinkHandler<HtmlRR0Context> {
     protected service: TimeService;
     protected urlBuilder: TimeUrlBuilder;

package/dist/time/TimeService.d.ts

@@ -1,8 +1,8 @@
 import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
 import { AbstractDataService, AllDataService, RR0Event, RR0EventJson } from "@rr0/data";
-import { HtmlRR0Context } from "../RR0Context";
+import { HtmlRR0Context } from "../RR0Context.js";
 import { TimeContext } from "@rr0/time";
-import { TimeOptions } from "./TimeOptions";
+import { TimeOptions } from "./TimeOptions.js";
 export declare class TimeService extends AbstractDataService<RR0Event, RR0EventJson> {
     protected options: TimeOptions;
     readonly timePathRegex: RegExp;
@@ -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 { RR0ContextImpl } from "../RR0Context";
-import { StringUtil } from "../util";
+import { AbstractDataService, EventDataFactory, RR0EventFactory } from "@rr0/data";
+import { RR0ContextImpl } from "../RR0Context.js";
+import { StringUtil } from "../util/index.js";
 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/TimeTagReplaceCommand.test.js

@@ -6,7 +6,8 @@ import { TimeReplacer } from "./html/TimeReplacer.js";
 import path from "path";
 describe("HtmlTagReplaceCommand", async () => {
     const timeRoot = rr0TestUtil.time.timeOptions.rootDir;
-    const timeService = await rr0TestUtil.time.getService({ rootDir: path.join(rr0TestUtil.rootDir, timeRoot), files: ["time/2/0/0/4/index.html"] });
+    const timeOptions = { rootDir: timeRoot, files: [rr0TestUtil.time.filePath("2/0/0/4/index.html")] };
+    const timeService = await rr0TestUtil.time.getService(timeOptions);
     test("replace time tag", async () => {
         const replacer = new TimeReplacer(rr0TestUtil.time.timeElementFactory);
         const command = new DomReplaceCommand("time", new TimeReplacerFactory(replacer, rr0TestUtil.time.urlBuilder));

package/dist/time/TimeTestUtil.d.ts

@@ -1,7 +1,7 @@
 import { TimeElementFactory, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
-import { RR0TestUtil } from "../test";
-import { HtmlRR0Context } from "../RR0Context";
-import { TimeOptions } from "./TimeOptions";
+import { RR0TestUtil } from "../test/index.js";
+import { HtmlRR0Context } from "../RR0Context.js";
+import { TimeOptions } from "./TimeOptions.js";
 export declare class TimeTestUtil {
     readonly timeTextBuilder: TimeTextBuilder;
     timeElementFactory: TimeElementFactory;

package/dist/time/TimeTestUtil.js

@@ -1,10 +1,12 @@
 import path from "path";
 import { TimeElementFactory, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
-import { rr0TestUtil } from "../test";
+import { rr0TestUtil } from "../test/index.js";
 export class TimeTestUtil {
     constructor(rr0TestUtil) {
         this.timeOptions = { rootDir: "time", files: [] };
         this.urlBuilder = new TimeUrlBuilder(this.timeOptions);
+        Object.assign(this.urlBuilder, { ...this.urlBuilder.options, rootDir: rr0TestUtil.filePath(this.timeOptions.rootDir) });
+        console.log(this.urlBuilder.options);
         this.timeTextBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
         this.fullRoot = path.join(rr0TestUtil.rootDir, this.timeOptions.rootDir);
         this.timeRenderer = new TimeRenderer(this.urlBuilder, this.timeTextBuilder);
@@ -23,6 +25,7 @@ export class TimeTestUtil {
             || this.timeOptions.rootDir !== options.rootDir
             || JSON.stringify(this.timeService.files) !== JSON.stringify(options.files)) {
             this.timeOptions = options;
+            Object.assign(this.urlBuilder.options, options);
             this.timeService = new TimeService(rr0TestUtil.dataService, options);
             this.timeElementFactory = new TimeElementFactory(this.timeRenderer);
         }

package/dist/time/TimeUrlBuilder.d.ts

@@ -1,5 +1,5 @@
 import { Level2Date as EdtfDate, TimeContext } from "@rr0/time";
-import { TimeOptions } from "./TimeOptions";
+import { TimeOptions } from "./TimeOptions.js";
 export type TimeUrlBuilderOptions = TimeOptions;
 export declare class TimeUrlBuilder {
     readonly options: TimeUrlBuilderOptions;

package/dist/time/TitleReplaceCommand.test.js

@@ -3,11 +3,7 @@ import { rr0TestUtil } from "../test/index.js";
 import { describe, expect, test } from "@javarome/testscript";
 describe("TitleReplaceCommand", () => {
     let timeTextBuilder = rr0TestUtil.time.timeTextBuilder;
-    const timeDefaultHandler = (context) => {
-        let title;
-        title = rr0TestUtil.time.getService().titleFromFile(context, context.file.name, timeTextBuilder);
-        return title;
-    };
+    const timeDefaultHandler = (context) => rr0TestUtil.time.getService().titleFromFile(context, context.file.name, timeTextBuilder);
     describe("Time page", () => {
         const fileName = rr0TestUtil.time.filePath("1/9/5/4/index.html");
         test("default title with no handler", async () => {

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

@@ -1,4 +1,4 @@
-import { Datasource } from "./Datasource";
+import { Datasource } from "./Datasource.js";
 import { HtmlRR0Context } from "../../RR0Context.js";
 import { ContextFilter } from "./ContextFilter.js";
 /**

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

@@ -7,7 +7,7 @@ import { NoteFileCounter, NoteRenderer } from "../../note/index.js";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { HttpSource } from "./HttpSource.js";
 import { AllDataService } from "@rr0/data";
-import { UrecatRR0Mapping } from "./urecat";
+import { UrecatRR0Mapping } from "./urecat/UrecatRR0Mapping.js";
 describe("ChronologyReplacer", () => {
     let context;
     let chronologyReplacer;

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

@@ -3,7 +3,7 @@ import { ChronologyReplacer } from "./ChronologyReplacer.js";
 import { HtmlRR0Context } from "../../RR0Context.js";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
 import { RR0CaseMapping } from "./rr0/RR0CaseMapping.js";
-import { TimeUrlBuilder } from "../TimeUrlBuilder";
+import { TimeUrlBuilder } from "../TimeUrlBuilder.js";
 export declare class ChronologyReplacerFactory implements ReplacerFactory<DomReplacer> {
     protected timeUrlBuilder: TimeUrlBuilder;
     protected readonly replacer: ChronologyReplacer;

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/DatasourceTestCase.d.ts

@@ -2,8 +2,8 @@ import { HtmlRR0Context } from "../../RR0Context.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { RR0CaseMapping } from "./rr0/index.js";
-import { Source } from "@rr0/data/dist/source";
-import { PlaceRenderer } from "../../place/PlaceRenderer";
+import { RR0SourceType, Source } from "@rr0/data";
+import { PlaceRenderer } from "../../place/PlaceRenderer.js";
 export declare abstract class DatasourceTestCase<S> {
     readonly mapping: RR0CaseMapping<S>;
     readonly sourceCases: S[];
@@ -16,5 +16,5 @@ export declare abstract class DatasourceTestCase<S> {
     testFetch(context: HtmlRR0Context): Promise<void>;
     protected abstract sortComparator(c1: S, c2: S): number;
     protected abstract getTime(c: S): EdtfDate;
-    protected expectedSourceStr(context: HtmlRR0Context, expectedSources: Source[], nativeCase: S): string;
+    protected expectedSourceStr(context: HtmlRR0Context, expectedSources: Source<RR0SourceType>[], nativeCase: S): string;
 }

package/dist/time/datasource/DatasourceTestCase.js

@@ -6,9 +6,9 @@ import { NoteFileCounter, NoteRenderer } from "../../note/index.js";
 import { HttpSource } from "./HttpSource.js";
 import { TimeElementFactory } from "../html/TimeElementFactory.js";
 import { TimeRenderer } from "../html/TimeRenderer.js";
-import { rr0TestUtil } from "../../test";
+import { rr0TestUtil } from "../../test/index.js";
 import { AllDataService } from "@rr0/data";
-import { PlaceRenderer } from "../../place/PlaceRenderer";
+import { PlaceRenderer } from "../../place/PlaceRenderer.js";
 export class DatasourceTestCase {
     constructor(mapping, sourceCases, intlOptions = {
         year: "numeric",

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/JsonMapper.test.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import { rr0TestUtil } from "../../test/index.js";
 import { ufoSearchTestCases } from "./ufo-search/UfoSearchTestCases.js";
 import path from "path";
-import { UfoSearchRR0Mapping } from "./ufo-search";
+import { UfoSearchRR0Mapping } from "./ufo-search/index.js";
 describe("JsonMapper", () => {
     let context;
     beforeEach(() => {

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

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { TimeContextFilter } from "./TimeContextFilter";
-import { rr0TestUtil } from "../../test";
+import { TimeContextFilter } from "./TimeContextFilter.js";
+import { rr0TestUtil } from "../../test/index.js";
 describe("TimeContextFilter", () => {
     let context;
     beforeEach(() => {

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.js

@@ -1,6 +1,6 @@
 import assert from "assert";
 import { Level2Date as EdtfDate } from "@rr0/time";
-import { OrganizationPlace } from "../../../place/OrganizationPlace";
+import { OrganizationPlace } from "../../../place/OrganizationPlace.js";
 /**
  * Maps a Base OVNI France case to a RR0 case.
  */

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.test.js

@@ -7,7 +7,7 @@ import { leMans72 } from "../../../org/eu/fr/region/pdl/72/LeMans/LeMans.js";
 import { lyon69 } from "../../../org/eu/fr/region/ara/69/Lyon/Lyon.js";
 import { briancon05 } from "../../../org/eu/fr/region/pac/05/briancon/Briancon.js";
 import { chambonSurVoueize23 } from "../../../org/eu/fr/region/naq/23/Chambon/Chambon.js";
-import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryRR0Mapper";
+import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryRR0Mapper.js";
 function expectedSource(datasource, dataDate, caseNumber) {
     const url = new URL(datasource.searchPath + "?typlist=20&page=0&numobs=" + caseNumber, datasource.baseUrl).href;
     return {

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.js";
 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;