@rr0/cms 0.1.14 → 0.1.16

package/dist/time/Time.js

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

package/dist/time/TimeLinkDefaultHandler.d.ts

@@ -1,14 +1,15 @@
 import { LinkHandler } from "../MetaLinkReplaceCommand.js";
-import { HtmlRR0SsgContext } from "../RR0SsgContext.js";
+import { HtmlRR0Context } from "../RR0Context.js";
 import { Link } from "ssg-api";
-import { TimeTextBuilder } from "./TimeTextBuilder.js";
-export declare class TimeLinkDefaultHandler implements LinkHandler<HtmlRR0SsgContext> {
-    protected timeFiles: string[];
+import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
+import { TimeService } from "./TimeService";
+export declare class TimeLinkDefaultHandler implements LinkHandler<HtmlRR0Context> {
+    protected service: TimeService;
     protected timeTextBuilder: TimeTextBuilder;
-    constructor(timeFiles: string[], timeTextBuilder: TimeTextBuilder);
-    contents(context: HtmlRR0SsgContext): Link | undefined;
-    next(context: HtmlRR0SsgContext): Link | undefined;
-    prev(context: HtmlRR0SsgContext): Link | undefined;
-    start(context: HtmlRR0SsgContext): Link | undefined;
+    constructor(service: TimeService, timeTextBuilder: TimeTextBuilder);
+    contents(context: HtmlRR0Context): Link | undefined;
+    next(context: HtmlRR0Context): Link | undefined;
+    prev(context: HtmlRR0Context): Link | undefined;
+    start(context: HtmlRR0Context): Link | undefined;
     protected isTimeFile(fileName: string): boolean;
 }

package/dist/time/TimeLinkDefaultHandler.js

@@ -1,19 +1,15 @@
 import { Time } from "./Time.js";
 import { LinkType } from "ssg-api";
 export class TimeLinkDefaultHandler {
-    constructor(timeFiles, timeTextBuilder) {
-        this.timeFiles = timeFiles;
+    constructor(service, timeTextBuilder) {
+        this.service = service;
         this.timeTextBuilder = timeTextBuilder;
     }
     contents(context) {
         const prevLink = this.prev(context);
         if (prevLink) {
-            let contentUrl = prevLink.url.substring(1);
-            do {
-                const slash = contentUrl.lastIndexOf("/");
-                contentUrl = contentUrl.substring(0, slash);
-            } while (this.timeFiles.indexOf(contentUrl) < 0 && contentUrl !== "time");
-            if (contentUrl != "time") {
+            let contentUrl = this.service.matchExistingTimeFile(prevLink.url.substring(1));
+            if (contentUrl != this.service.root) {
                 const text = Time.titleFromFile(context, contentUrl, this.timeTextBuilder);
                 if (text) {
                     return { type: LinkType.prev, text, url: "/" + contentUrl };
@@ -24,9 +20,9 @@ export class TimeLinkDefaultHandler {
     next(context) {
         let fileName = context.file.name;
         if (this.isTimeFile(fileName)) {
-            const pos = this.timeFiles.indexOf(fileName);
+            const pos = this.service.files.indexOf(fileName);
             if (pos >= 0) {
-                const nextFile = this.timeFiles[pos + 1];
+                const nextFile = this.service.files[pos + 1];
                 if (nextFile) {
                     const text = Time.titleFromFile(context, nextFile, this.timeTextBuilder);
                     return { type: LinkType.next, text, url: "/" + nextFile };
@@ -37,9 +33,9 @@ export class TimeLinkDefaultHandler {
     prev(context) {
         let fileName = context.file.name;
         if (this.isTimeFile(fileName)) {
-            const pos = this.timeFiles.indexOf(fileName);
+            const pos = this.service.files.indexOf(fileName);
             if (pos >= 0) {
-                const prevFile = this.timeFiles[pos - 1];
+                const prevFile = this.service.files[pos - 1];
                 if (prevFile) {
                     const text = Time.titleFromFile(context, prevFile, this.timeTextBuilder);
                     if (text) {

package/dist/time/TimeService.d.ts

@@ -1,12 +1,21 @@
-import { TimeRenderer } from "./TimeRenderer.js";
-import { TimeTextBuilder } from "./TimeTextBuilder.js";
+import { TimeRenderer } from "./html/TimeRenderer.js";
+import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
 import { AbstractDataService, AllDataService } from "../data/index.js";
 import { RR0Event } from "../event/index.js";
+import { TimeUrlBuilder } from "./TimeUrlBuilder";
+export type TimeServiceOptions = {
+    readonly root: string;
+    readonly files: string[];
+};
 export declare class TimeService extends AbstractDataService<RR0Event> {
     readonly textBuilder: TimeTextBuilder;
-    constructor(dataService: AllDataService, textBuilder: TimeTextBuilder);
-    protected _renderer: TimeRenderer;
-    get renderer(): TimeRenderer;
-    getFiles(): Promise<string[]>;
-    isTimeFile(filePath: string): Promise<boolean>;
+    readonly urlBuilder: TimeUrlBuilder;
+    readonly renderer: TimeRenderer;
+    readonly root: string;
+    constructor(dataService: AllDataService, textBuilder: TimeTextBuilder, urlBuilder: TimeUrlBuilder, options: TimeServiceOptions);
+    isTimeFile(filePath: string): boolean;
+    /**
+     * @return the found time URL or undefined if not found.
+     */
+    matchExistingTimeFile(url: string): string | undefined;
 }

package/dist/time/TimeService.js

@@ -1,30 +1,24 @@
-import { TimeRenderer } from "./TimeRenderer.js";
+import { TimeRenderer } from "./html/TimeRenderer.js";
 import { AbstractDataService } from "../data/index.js";
-import { glob } from "glob";
 export class TimeService extends AbstractDataService {
-    constructor(dataService, textBuilder) {
-        super(dataService, null);
+    constructor(dataService, textBuilder, urlBuilder, options) {
+        super(dataService, null, options.files);
         this.textBuilder = textBuilder;
+        this.urlBuilder = urlBuilder;
+        this.root = options.root;
+        this.renderer = new TimeRenderer(this, this.textBuilder);
     }
-    get renderer() {
-        return this._renderer;
+    isTimeFile(filePath) {
+        return this.files.includes(filePath);
     }
-    async getFiles() {
-        if (!this.files) {
-            const minusYearFiles = await glob("time/-?/?/?/?/index.html");
-            const year1Files = await glob("time/?/index.html");
-            const year2Files = await glob("time/?/?/index.html");
-            const year3Files = await glob("time/?/?/?/index.html");
-            const year4Files = await glob("time/?/?/?/?/index.html");
-            const monthFiles = await glob("time/?/?/?/?/??/index.html");
-            const dayFiles = await glob("time/?/?/?/?/??/??/index.html");
-            const files = this.files = year1Files.concat(year2Files).concat(year3Files).concat(year4Files).concat(minusYearFiles).concat(monthFiles).concat(dayFiles).sort();
-            this._renderer = new TimeRenderer(files, this.textBuilder);
+    /**
+     * @return the found time URL or undefined if not found.
+     */
+    matchExistingTimeFile(url) {
+        while (url && url !== this.root && this.files.indexOf(`${url}/index.html`) < 0) {
+            const slash = url.lastIndexOf("/");
+            url = url.substring(0, slash);
         }
-        return this.files;
-    }
-    async isTimeFile(filePath) {
-        const files = await this.getFiles();
-        return files.includes(filePath);
+        return url === this.root ? undefined : url;
     }
 }

package/dist/time/TimeTestUtil.d.ts

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

package/dist/time/TimeTestUtil.js

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

package/dist/time/TimeUrlBuilder.d.ts

@@ -1,5 +1,9 @@
-import { TimeContext } from "./TimeContext.js";
+import { TimeContext } from "@rr0/time";
+export type TimeUrlBuilderOptions = {
+    rootDir: string;
+};
 export declare class TimeUrlBuilder {
-    static readonly root = "time/";
-    static fromContext(time: TimeContext): string;
+    readonly options: TimeUrlBuilderOptions;
+    constructor(options: TimeUrlBuilderOptions);
+    fromContext(time: TimeContext): string;
 }

package/dist/time/TimeUrlBuilder.js

@@ -1,9 +1,13 @@
+import path from "path";
 export class TimeUrlBuilder {
-    static fromContext(time) {
-        let url = this.root;
+    constructor(options) {
+        this.options = options;
+    }
+    fromContext(time) {
+        let url = this.options.rootDir;
         const year = time.getYear();
         if (year) {
-            url += year.toString().split("").join("/");
+            url = path.join(url, year.toString().split("").join("/"));
         }
         let month = time.getMonth();
         if (month) {
@@ -16,4 +20,3 @@ export class TimeUrlBuilder {
         return url;
     }
 }
-TimeUrlBuilder.root = "time/";

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

@@ -1,5 +1,5 @@
 import { Datasource } from "./Datasource";
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
 import { ContextFilter } from "./ContextFilter.js";
 /**
  * Cache cases which were already fetched, and filter out cases in memory according to (time) context.
@@ -9,9 +9,9 @@ export declare abstract class AbstractDatasource<S> implements Datasource<S> {
     readonly copyright: string;
     protected readonly cases: Map<string, S[]>;
     protected constructor(authors: string[], copyright: string);
-    getCases(context: HtmlRR0SsgContext): Promise<S[]>;
-    fetch(context: HtmlRR0SsgContext): Promise<S[]>;
-    protected createFilter(context: HtmlRR0SsgContext): ContextFilter<S>;
-    protected contextKey(context: HtmlRR0SsgContext): string;
-    protected abstract readCases(context: HtmlRR0SsgContext): Promise<S[]>;
+    getCases(context: HtmlRR0Context): Promise<S[]>;
+    fetch(context: HtmlRR0Context): Promise<S[]>;
+    protected createFilter(context: HtmlRR0Context): ContextFilter<S>;
+    protected contextKey(context: HtmlRR0Context): string;
+    protected abstract readCases(context: HtmlRR0Context): Promise<S[]>;
 }

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

@@ -1,12 +1,12 @@
 import { DomReplacement } from "../DomReplacement.js";
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
 import { RR0CaseSummary } from "./rr0/RR0CaseSummary.js";
 import { RR0CaseMapping } from "./rr0/RR0CaseMapping.js";
 /**
  * Replaces a (ul) tag from (chronology) files with case summaries from external datasources.
  */
-export declare class ChronologyReplacer implements DomReplacement<HtmlRR0SsgContext, HTMLUListElement> {
+export declare class ChronologyReplacer implements DomReplacement<HtmlRR0Context, HTMLUListElement> {
     protected mappings: RR0CaseMapping<any>[];
     protected renderer: CaseSummaryRenderer;
     /**
@@ -16,8 +16,8 @@ export declare class ChronologyReplacer implements DomReplacement<HtmlRR0SsgCont
      */
     protected readonly done: Set<string>;
     constructor(mappings: RR0CaseMapping<any>[], renderer: CaseSummaryRenderer);
-    replacement(context: HtmlRR0SsgContext, element: HTMLUListElement): Promise<HTMLUListElement>;
-    protected aggregate(context: HtmlRR0SsgContext, element: HTMLUListElement): Promise<void>;
-    protected aggregateDatasource(mapping: RR0CaseMapping<any>, context: HtmlRR0SsgContext, existingCases: RR0CaseSummary[], casesToAdd: RR0CaseSummary[]): Promise<void>;
-    protected merge(context: HtmlRR0SsgContext, sourceCases: any[], fetchTime: Date, mapping: RR0CaseMapping<any>, existingCases: RR0CaseSummary[]): RR0CaseSummary[];
+    replacement(context: HtmlRR0Context, element: HTMLUListElement): Promise<HTMLUListElement>;
+    protected aggregate(context: HtmlRR0Context, element: HTMLUListElement): Promise<void>;
+    protected aggregateDatasource(mapping: RR0CaseMapping<any>, context: HtmlRR0Context, existingCases: RR0CaseSummary[], casesToAdd: RR0CaseSummary[]): Promise<void>;
+    protected merge(context: HtmlRR0Context, sourceCases: any[], fetchTime: Date, mapping: RR0CaseMapping<any>, existingCases: RR0CaseSummary[]): RR0CaseSummary[];
 }

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

@@ -1,6 +1,6 @@
 import { DomReplacer, ReplacerFactory } from "ssg-api";
 import { ChronologyReplacer } from "./ChronologyReplacer.js";
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
 import { TimeService } from "../TimeService.js";
 import { RR0CaseMapping } from "./rr0/RR0CaseMapping.js";
@@ -13,5 +13,5 @@ export declare class ChronologyReplacerFactory implements ReplacerFactory<DomRep
      *
      * @param context
      */
-    create(context: HtmlRR0SsgContext): Promise<DomReplacer>;
+    create(context: HtmlRR0Context): Promise<DomReplacer>;
 }

package/dist/time/datasource/ChronologyReplacerFactory.js

@@ -12,7 +12,7 @@ export class ChronologyReplacerFactory {
     async create(context) {
         return {
             replace: async (ul) => {
-                const isTimeFile = await this.timeService.isTimeFile(context.file.name);
+                const isTimeFile = this.timeService.isTimeFile(context.file.name);
                 if (isTimeFile) {
                     ul = await this.replacer.replacement(context, ul);
                 }

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

@@ -1,12 +1,12 @@
 import { UfoCaseFilter } from "./UfoCaseFilter.js";
-import { RR0SsgContext } from "../../RR0SsgContext.js";
+import { RR0Context } from "../../RR0Context.js";
 export declare abstract class ContextFilter<T> implements UfoCaseFilter<T> {
-    protected context: RR0SsgContext;
+    protected context: RR0Context;
     /**
      * @param context The context to match
      * @protected
      */
-    protected constructor(context: RR0SsgContext);
+    protected constructor(context: RR0Context);
     /**
      * @param ufoCase
      * @return if that UFO case matches the filter.

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

@@ -1,4 +1,4 @@
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
 import { Datasource } from "./Datasource.js";
 import { CsvMapper } from "./CsvMapper.js";
 import { FileSource } from "./FileSource.js";
@@ -15,5 +15,5 @@ export declare class CsvFileSource<S> extends FileSource {
      * @protected
      */
     fileName(context: HtmlSsgContext, datasource: Datasource<S>): string;
-    write(context: HtmlRR0SsgContext, datasourceCases: S[], fetchTime: Date, datasource: Datasource<any>): void;
+    write(context: HtmlRR0Context, datasourceCases: S[], fetchTime: Date, datasource: Datasource<any>): void;
 }

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

@@ -1,12 +1,12 @@
 import { CaseMapper } from "./CaseMapper.js";
-import { RR0SsgContext } from "../../RR0SsgContext.js";
-export declare class CsvMapper<S> implements CaseMapper<RR0SsgContext, S, string> {
+import { RR0Context } from "../../RR0Context.js";
+export declare class CsvMapper<S> implements CaseMapper<RR0Context, S, string> {
     readonly sep: string;
     readonly escapeStr: string;
     readonly prefix: string;
     readonly fields: Set<string>;
     constructor(sep?: string, escapeStr?: string, prefix?: string);
-    readonly fieldMapper: (context: RR0SsgContext, key: string, value: any, sourceTime: Date) => string;
+    readonly fieldMapper: (context: RR0Context, key: string, value: any, sourceTime: Date) => string;
     /**
      * Map a case to a CSV row.
      *
@@ -14,7 +14,7 @@ export declare class CsvMapper<S> implements CaseMapper<RR0SsgContext, S, string
      * @param sourceCase
      * @param sourceTime
      */
-    map(context: RR0SsgContext, sourceCase: S, sourceTime: Date): string;
+    map(context: RR0Context, sourceCase: S, sourceTime: Date): string;
     /**
      * Reduce a set of cases to a CSV string.
      *
@@ -22,7 +22,7 @@ export declare class CsvMapper<S> implements CaseMapper<RR0SsgContext, S, string
      * @param sourceCases
      * @param sourceTime
      */
-    mapAll(context: RR0SsgContext, sourceCases: S[], sourceTime: Date): string;
+    mapAll(context: RR0Context, sourceCases: S[], sourceTime: Date): string;
     escape(value: string, force?: boolean): string;
     /**
      * Converts CSV contents to a list of cases.

package/dist/time/datasource/CsvMapper.js

@@ -1,4 +1,4 @@
-import { TimeContext } from "../TimeContext.js";
+import { TimeContext } from "@rr0/time";
 export class CsvMapper {
     constructor(sep = ",", escapeStr = "\"", prefix = "") {
         this.sep = sep;

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

@@ -1,4 +1,4 @@
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
 /**
  * A source for cases.
  *
@@ -19,5 +19,5 @@ export interface Datasource<S> {
      * @param context
      * @return Promise<S[]>
      */
-    fetch(context: HtmlRR0SsgContext): Promise<S[]>;
+    fetch(context: HtmlRR0Context): Promise<S[]>;
 }

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

@@ -1,6 +1,6 @@
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
-import { TimeContext } from "../TimeContext.js";
-import { TimeTextBuilder } from "../TimeTextBuilder.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
+import { TimeContext } from "@rr0/time";
+import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { Source } from "../../source/index.js";
 import { RR0CaseMapping } from "./rr0/index.js";
 export declare abstract class DatasourceTestCase<S> {
@@ -8,11 +8,11 @@ export declare abstract class DatasourceTestCase<S> {
     readonly sourceCases: S[];
     protected readonly intlOptions: Intl.DateTimeFormatOptions;
     timeTextBuilder: TimeTextBuilder;
-    protected constructor(mapping: RR0CaseMapping<S>, sourceCases: S[]);
-    checkCaseHTML(context: HtmlRR0SsgContext, nativeCase: S, item: HTMLLIElement, dataDate: Date): void;
-    testRender(context: HtmlRR0SsgContext): Promise<void>;
-    testFetch(context: HtmlRR0SsgContext): Promise<void>;
+    protected constructor(mapping: RR0CaseMapping<S>, sourceCases: S[], intlOptions?: Intl.DateTimeFormatOptions);
+    checkCaseHTML(context: HtmlRR0Context, nativeCase: S, item: HTMLLIElement, dataDate: Date): void;
+    testRender(context: HtmlRR0Context): Promise<void>;
+    testFetch(context: HtmlRR0Context): Promise<void>;
     protected abstract sortComparator(c1: S, c2: S): number;
     protected abstract getTime(c: S): TimeContext;
-    protected expectedSourceStr(context: HtmlRR0SsgContext, expectedSources: Source[], nativeCase: S): string;
+    protected expectedSourceStr(context: HtmlRR0Context, expectedSources: Source[], nativeCase: S): string;
 }

package/dist/time/datasource/DatasourceTestCase.js

@@ -1,25 +1,26 @@
 import { expect } from "@javarome/testscript";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
-import { TimeTextBuilder } from "../TimeTextBuilder.js";
+import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { SourceFactory, SourceRenderer } from "../../source/index.js";
 import { NoteFileCounter, NoteRenderer } from "../../note/index.js";
 import { AllDataService } from "../../data/index.js";
 import { HttpSource } from "./HttpSource.js";
-import { TimeElementFactory } from "../TimeElementFactory.js";
-import { TimeRenderer } from "../TimeRenderer.js";
+import { TimeElementFactory } from "../html/TimeElementFactory.js";
+import { TimeRenderer } from "../html/TimeRenderer.js";
+import { rr0TestUtil } from "../../test";
 export class DatasourceTestCase {
-    constructor(mapping, sourceCases) {
+    constructor(mapping, sourceCases, intlOptions = {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+        weekday: "long",
+        hour: "2-digit",
+        minute: "2-digit",
+        timeZoneName: "short"
+    }) {
         this.mapping = mapping;
         this.sourceCases = sourceCases;
-        this.intlOptions = {
-            year: "numeric",
-            month: "long",
-            day: "numeric",
-            weekday: "long",
-            hour: "2-digit",
-            minute: "2-digit",
-            timeZoneName: "short"
-        };
+        this.intlOptions = intlOptions;
         this.timeTextBuilder = new TimeTextBuilder(this.intlOptions);
     }
     checkCaseHTML(context, nativeCase, item, dataDate) {
@@ -27,7 +28,7 @@ export class DatasourceTestCase {
         const time = this.getTime(nativeCase);
         const caseContext = context.clone();
         Object.assign(caseContext, { time });
-        const timeStr = this.timeTextBuilder.build(caseContext);
+        const timeStr = this.timeTextBuilder.build(caseContext, true);
         const placeStr = expected.place ? ` À <span class="place">${expected.place.name}</span>` : "";
         const expectedSources = expected.sources;
         const sourceStr = (expectedSources === null || expectedSources === void 0 ? void 0 : expectedSources.length) > 0 ? this.expectedSourceStr(context, expectedSources, nativeCase) : "";
@@ -41,7 +42,8 @@ export class DatasourceTestCase {
         const baseUrl = "https://rr0.org";
         const http = new HttpSource();
         const sourceFactory = new SourceFactory(dataService, http, baseUrl, this.intlOptions);
-        const timeElementFactory = new TimeElementFactory(new TimeRenderer([], this.timeTextBuilder));
+        const timeService = await rr0TestUtil.time.getService();
+        const timeElementFactory = new TimeElementFactory(new TimeRenderer(timeService, this.timeTextBuilder));
         const eventRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(this.timeTextBuilder), timeElementFactory);
         const items = [];
         for (const c of cases) {
@@ -67,7 +69,7 @@ export class DatasourceTestCase {
         const source = expectedSources[0];
         const sourceContext = context.clone();
         sourceContext.time = source.publication.time;
-        const publicationStr = source.publication ? `, ${this.timeTextBuilder.build(sourceContext)}` : "";
+        const publicationStr = source.publication ? `, ${this.timeTextBuilder.build(sourceContext, true)}` : "";
         const indexStr = source.index ? `, ${source.index}` : "";
         const authorStr = datasource.authors.map(authorStr => `<span class="people">${authorStr}</span>`).join(" &amp; ");
         const title = `cas n° ${nativeCase["id"]}`;

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

@@ -1,5 +1,5 @@
-import { HtmlRR0SsgContext } from "../../RR0SsgContext.js";
+import { HtmlRR0Context } from "../../RR0Context.js";
 import { Datasource } from "./Datasource.js";
 export interface FileDatasource<S> extends Datasource<S> {
-    save(context: HtmlRR0SsgContext, fetched: any[], fetchTime: Date): void;
+    save(context: HtmlRR0Context, fetched: any[], fetchTime: Date): void;
 }

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

@@ -1,12 +1,12 @@
 import { CaseMapper } from "./CaseMapper.js";
-import { RR0SsgContext } from "../../RR0SsgContext.js";
-export declare class JsonMapper<S> implements CaseMapper<RR0SsgContext, S, Object> {
-    map(context: RR0SsgContext, sourceCase: S, sourceTime: Date): Object;
+import { RR0Context } from "../../RR0Context.js";
+export declare class JsonMapper<S> implements CaseMapper<RR0Context, S, Object> {
+    map(context: RR0Context, sourceCase: S, sourceTime: Date): Object;
     /**
      * Converts CSV contents to a list of cases.
      *
      * @param context
      * @param data
      */
-    parse(context: RR0SsgContext, data: string): S[];
+    parse(context: RR0Context, data: string): S[];
 }

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

@@ -1,10 +1,10 @@
 import { ContextFilter } from "./ContextFilter.js";
-import { RR0SsgContext } from "../../RR0SsgContext.js";
-import { TimeContext } from "../TimeContext.js";
+import { RR0Context } from "../../RR0Context.js";
+import { TimeContext } from "@rr0/time";
 export interface TimeContextCase {
     time?: TimeContext;
 }
 export declare class TimeContextFilter<S extends TimeContextCase> extends ContextFilter<S> {
-    constructor(context: RR0SsgContext);
+    constructor(context: RR0Context);
     filter(c: S): boolean;
 }

package/dist/time/datasource/acufo/AcufoCase.d.ts

@@ -1,4 +1,4 @@
-import { TimeContext } from "../../TimeContext.js";
+import { TimeContext } from "@rr0/time";
 import { City } from "../../../org/country/region/department/city/City.js";
 export type AcufoCaseDataTime = {
     dateTime: TimeContext;

package/dist/time/datasource/acufo/AcufoDatasource.d.ts

@@ -1,4 +1,4 @@
-import { RR0SsgContext } from "../../../RR0SsgContext.js";
+import { RR0Context } from "../../../RR0Context.js";
 import { HttpSource } from "../HttpSource.js";
 import { AcufoCase } from "./AcufoCase.js";
 import { AbstractDatasource } from "../AbstractDatasource.js";
@@ -7,6 +7,6 @@ export declare class AcufoDatasource extends AbstractDatasource<AcufoCase> {
     readonly searchPath: string;
     protected http: HttpSource;
     constructor(baseUrl?: string, searchPath?: string);
-    protected readCases(context: RR0SsgContext): Promise<AcufoCase[]>;
-    protected getNativeCase(context: RR0SsgContext, row: Element): AcufoCase;
+    protected readCases(context: RR0Context): Promise<AcufoCase[]>;
+    protected getNativeCase(context: RR0Context, row: Element): AcufoCase;
 }

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

@@ -1,4 +1,4 @@
-import { TimeContext } from "../../TimeContext.js";
+import { TimeContext } from "@rr0/time";
 export declare enum BaseOvniFranceTypeObservation {
     visualClose = "Visuel : proche",
     visualFar = "Visuel : Eloign\u00E9"