@rr0/cms 0.3.81 → 0.3.82

package/dist/DataContentVisitor.js

@@ -1,5 +1,6 @@
 import path from "path";
 import assert from "assert";
+import { EventTime } from "@rr0/data";
 /**
  * Insert content in context file, according to data found in .json files aside of it.
  */
@@ -26,7 +27,7 @@ export class DataContentVisitor {
     async process(context, data) {
         this.processTitle(context, data);
         this.processURL(context, data);
-        const events = data.events.sort((event1, event2) => event1.time ? event2.time ? event1.time.isBefore(event2.time) ? -1 : 1 : -1 : 1);
+        const events = data.events.sort((event1, event2) => event1.time ? event2.time ? EventTime.start(event1.time).isBefore(EventTime.start(event2.time)) ? -1 : 1 : -1 : 1);
         for (const event of events) {
             await this.processEvent(context, event, data);
         }
@@ -85,8 +86,9 @@ export class DataContentVisitor {
     timeParagraph(context, event) {
         const container = context.file.document.createElement("p");
         const eventContext = context.clone();
-        const eventTime = eventContext.time.date = event.time;
+        const eventTime = event.time;
         assert.ok(eventTime, `Event of type "${event.type}" has no time for paragraph`);
+        eventContext.time.set(eventTime);
         container.dataset.time = eventTime.toString();
         const timeEl = this.timeElementFactory.create(eventContext, context, { url: true, contentOnly: false });
         return { eventP: container, timeEl };

package/dist/anchor/CaseAnchorHandler.js

@@ -1,5 +1,6 @@
 import path from "path";
 import { TimeContext } from "../time/TimeContext.mjs";
+import { EventTime } from "@rr0/data";
 export class CaseAnchorHandler {
     constructor(caseService, timeTextBuilder) {
         this.caseService = caseService;
@@ -32,7 +33,8 @@ export class CaseAnchorHandler {
                         }
                     }
                     else {
-                        caseContext.time = new TimeContext((_a = caseTime.year) === null || _a === void 0 ? void 0 : _a.value, (_b = caseTime.month) === null || _b === void 0 ? void 0 : _b.value, (_c = caseTime.day) === null || _c === void 0 ? void 0 : _c.value, (_d = caseTime.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = caseTime.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = caseTime.timeshift) === null || _f === void 0 ? void 0 : _f.toString());
+                        const startTime = EventTime.start(caseTime);
+                        caseContext.time = new TimeContext((_a = startTime.year) === null || _a === void 0 ? void 0 : _a.value, (_b = startTime.month) === null || _b === void 0 ? void 0 : _b.value, (_c = startTime.day) === null || _c === void 0 ? void 0 : _c.value, (_d = startTime.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = startTime.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = startTime.timeshift) === null || _f === void 0 ? void 0 : _f.toString());
                     }
                     titles.push(this.timeTextBuilder.build(caseContext));
                 }

package/dist/book/BookDirectoryStep.js

@@ -6,6 +6,7 @@ import { RR0FileUtil } from "../util/file/RR0FileUtil.js";
 import { StringUtil } from "../util/string/StringUtil.js";
 import { HtmlTag } from "../util/html/HtmlTag.js";
 import { Chapter } from "./Chapters.js";
+import { EventTime } from "@rr0/data";
 /**
  * Scan directories for book information, then populates a template with collected data.
  */
@@ -77,7 +78,7 @@ export class BookDirectoryStep extends DirectoryStep {
         const details = [];
         const authors = dirBook.authors;
         const authorStr = authors ? authors.join(" & ") + ": " : "";
-        const time = dirBook.publication.time;
+        const time = EventTime.start(dirBook.publication.time);
         if (time) {
             const timeDetail = time.year.value;
             details.push(HtmlTag.toString("time", timeDetail.toString()));

package/dist/people/PeopleHtmlRenderer.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { Gender } from "@rr0/common";
-import { AbstractDataFactory } from "@rr0/data";
+import { EventTime, AbstractDataFactory } from "@rr0/data";
 export class PeopleHtmlRenderer {
     renderLink(context, people, pseudoPeopleList, allCountries, occupations, filterOccupations = [], content) {
         var _a, _b, _c;
@@ -15,8 +15,8 @@ export class PeopleHtmlRenderer {
         if (people.hoax) {
             classList.push("canular");
         }
-        const birthTimeStr = (_a = people.birthTime) === null || _a === void 0 ? void 0 : _a.year.toString();
-        const deathTimeStr = (_b = people.deathTime) === null || _b === void 0 ? void 0 : _b.year.toString();
+        const birthTimeStr = (_a = EventTime.start(people.birthTime)) === null || _a === void 0 ? void 0 : _a.year.toString();
+        const deathTimeStr = (_b = EventTime.start(people.deathTime)) === null || _b === void 0 ? void 0 : _b.year.toString();
         if (people.isDeceased()) {
             classList.push("deceased");
         }

package/dist/science/crypto/ufo/enquete/dossier/CaseFactory.js

@@ -1,12 +1,11 @@
-import { TypedDataFactory } from "@rr0/data";
+import { EventTime, TypedDataFactory } from "@rr0/data";
 import { NamedPlace } from "@rr0/place";
-import { Level2Date as EdtfDate } from "@rr0/time";
 export class CaseFactory extends TypedDataFactory {
     parse(dataJson) {
         const parsedCase = super.parse(dataJson);
         const time = dataJson.time;
         if (time) {
-            Object.assign(parsedCase, { time: EdtfDate.fromString(time) });
+            Object.assign(parsedCase, { time: EventTime.parse(time) });
         }
         const placeName = dataJson.place;
         if (placeName) {

package/dist/science/crypto/ufo/enquete/dossier/CaseFactory.test.d.ts

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

package/dist/science/crypto/ufo/enquete/dossier/CaseFactory.test.js

@@ -0,0 +1,38 @@
+import { describe, expect, test } from "vitest";
+import { FileContents, FileContentsLang } from "@javarome/fileutil";
+import { EventTime, RR0EventFactory } from "@rr0/data";
+import { Level2Date as EdtfDate, Level2Interval as EdtfInterval } from "@rr0/time";
+import { CaseFactory } from "./CaseFactory.js";
+describe("CaseFactory", () => {
+    function read(time) {
+        const lang = new FileContentsLang();
+        lang.lang = "";
+        lang.variants = [];
+        const file = new FileContents("test/science/crypto/ufo/enquete/dossier/SomeCase/case.json", "utf-8", `{
+  "type": "case",
+  "title": "Some case",
+  "time": "${time}",
+  "place": "Washington",
+  "events": []
+}
+`, new Date("2025-02-22T22:22:07.720Z"), lang);
+        return new CaseFactory(new RR0EventFactory()).createFromFile(file);
+    }
+    test("a date", () => {
+        const aCase = read("1952-07-19");
+        expect(aCase.time).toBeInstanceOf(EdtfDate);
+        expect(aCase.time.toString()).toBe("1952-07-19");
+    });
+    test("an approximate date", () => {
+        expect(read("~1952").time.toString()).toBe("~1952");
+    });
+    test("between x and y", () => {
+        const aCase = read("1952-07-19/1952-07-26");
+        expect(aCase.time).toBeInstanceOf(EdtfInterval);
+        expect(aCase.time.toString()).toBe("1952-07-19/1952-07-26");
+        expect(EventTime.start(aCase.time).day.value).toBe(19);
+    });
+    test("years", () => {
+        expect(read("1966/1993").time.toString()).toBe("1966/1993");
+    });
+});

package/dist/science/crypto/ufo/enquete/dossier/CaseService.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { AbstractDataService } from "@rr0/data";
+import { EventTime, AbstractDataService } from "@rr0/data";
 import { TimeContext } from "../../../../../time/TimeContext.mjs";
 export class CaseService extends AbstractDataService {
     constructor(dataService, factory, timeElementFactory, files) {
@@ -16,7 +16,7 @@ export class CaseService extends AbstractDataService {
             const classificationLabels = context.messages.case.classification.hynek[hynek];
             details.push(classificationLabels.short);
         }
-        const time = aCase.time;
+        const time = EventTime.start(aCase.time); // The year of an interval is the one it starts at
         const caseContext = context.clone();
         if (time) {
             caseContext.time = new TimeContext((_a = time.year) === null || _a === void 0 ? void 0 : _a.value, (_b = time.month) === null || _b === void 0 ? void 0 : _b.value, (_c = time.day) === null || _c === void 0 ? void 0 : _c.value, (_d = time.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = time.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = time.timeshift) === null || _f === void 0 ? void 0 : _f.toString());

package/dist/time/EventRenderer.js

@@ -31,8 +31,9 @@ export class EventRenderer {
     }
     async render(context, event, container, options = { url: true, contentOnly: false }) {
         const eventContext = context.clone();
-        const eventTime = eventContext.time.date = event.time;
+        const eventTime = event.time;
         assert.ok(eventTime, `Event of type "${event.type}" has no time`);
+        eventContext.time.set(eventTime);
         container.dataset.time = eventTime.toString();
         const timeEl = this.timeElementFactory.create(eventContext, context, options);
         container.append(timeEl);

package/dist/time/TimeContext.d.mts

@@ -161,6 +161,13 @@ export class TimeContext {
      * @return {this}
      */
     reset(): this;
+    /**
+     * Sets what this context is about: a date, or an interval when the time is only known to be within bounds.
+     *
+     * @param {EdtfDate | EdtfInterval | undefined} time
+     * @return {this}
+     */
+    set(time: EdtfDate | EdtfInterval | undefined): this;
     /**
      * @param {TimeContext} other
      * @return {boolean}

package/dist/time/TimeContext.mjs

@@ -307,6 +307,18 @@ export class TimeContext {
         this.duration = undefined;
         return this;
     }
+    /**
+     * Sets what this context is about: a date, or an interval when the time is only known to be within bounds.
+     *
+     * @param {EdtfDate | EdtfInterval | undefined} time
+     * @return {this}
+     */
+    set(time) {
+        this.date = time instanceof EdtfInterval ? undefined : time;
+        this.interval = time instanceof EdtfInterval ? time : undefined;
+        this.duration = undefined;
+        return this;
+    }
     /**
      * @param {TimeContext} other
      * @return {boolean}

package/dist/time/TimeContext.test.mjs

@@ -1,5 +1,6 @@
 import { TimeContext } from "./TimeContext.mjs";
 import { describe, expect, test } from "vitest";
+import { Level2Date, Level2Interval } from "@rr0/time";
 describe("TimeContext", () => {
     const timeContext = new TimeContext();
     const SECOND = 1000;
@@ -95,4 +96,32 @@ describe("TimeContext", () => {
         expect(clone.getHour()).toBe(17);
         expect(clone.getMinutes()).toBe(56);
     });
+    describe("set", () => {
+        test("a date", () => {
+            const context = new TimeContext().set(Level2Date.fromString("1952-07-19"));
+            expect(context.date.toString()).toBe("1952-07-19");
+            expect(context.interval).toBeUndefined();
+        });
+        test("an interval", () => {
+            const context = new TimeContext().set(Level2Interval.fromString("1952-07-19/1952-07-26"));
+            expect(context.date).toBeUndefined();
+            expect(context.interval.toString()).toBe("1952-07-19/1952-07-26");
+            expect(context.from.day.value).toBe(19);
+            expect(context.to.day.value).toBe(26);
+        });
+        test("replaces what was set before", () => {
+            const context = new TimeContext();
+            context.updateFromStr("1952-07-19");
+            context.set(Level2Interval.fromString("1966/1993"));
+            expect(context.date).toBeUndefined();
+            context.set(Level2Date.fromString("1970"));
+            expect(context.interval).toBeUndefined();
+            expect(context.date.toString()).toBe("1970");
+        });
+        test("nothing", () => {
+            const context = new TimeContext().set(undefined);
+            expect(context.date).toBeUndefined();
+            expect(context.interval).toBeUndefined();
+        });
+    });
 });

package/dist/time/TimeDirectoryStep.js

@@ -51,7 +51,7 @@ export class TimeDirectoryStep extends DirectoryStep {
         const eventContext = context.clone();
         this.service.setContextFromFile(eventContext, event.dirName);
         if (event.time) {
-            eventContext.time.date = event.time;
+            eventContext.time.set(event.time);
         }
         const ref = this.elementFactory.create(eventContext, context, { url: true, contentOnly: true });
         item.appendChild(ref);

package/dist/time/TimeEventRenderer.test.js

@@ -8,7 +8,7 @@ import { SourceRenderer } from "../source/SourceRenderer.js";
 import { NoteFileCounter } from "../note/NoteFileCounter.js";
 import { NoteRenderer } from "../note/NoteRenderer.js";
 import { HautsDeSeineCityCode } from "../org/eu/fr/region/idf/92/HautsDeSeineCityCode.js";
-import { AllDataService } from "@rr0/data";
+import { AllDataService, EventTime } from "@rr0/data";
 import { Place } from "@rr0/place";
 import { OrganizationPlace } from "../place/OrganizationPlace.js";
 import { hautsDeSeine } from "../org/eu/fr/region/idf/92/HautsDeSeine.js";
@@ -49,4 +49,45 @@ describe("TimeEventRenderer", () => {
         await renderer.render(context, c, elem);
         expect(elem.innerHTML).toBe(`<span class="time-resolved">en <time datetime="1970-03">mars 1970</time></span> À <span class="place">Nanterre (Hauts-de-Seine (Île-de-France (France)))</span>, some sighting <span class="source"><span class="peopl">Some Author</span>&nbsp;: <a href="https://somesite.com/case1">Case 1</a>, <i>Some site</i>, jeudi 13 décembre 2001</span>.`);
     });
+    describe("time", () => {
+        async function renderTime(time) {
+            const context = cmsTestUtil.time.newHtmlContext("1/9/7/0/03/index.html");
+            const c = {
+                events: [], type: "event", eventType: "sighting", time: EventTime.parse(time), description: "some sighting",
+                sources: []
+            };
+            const elem = context.file.document.createElement("li");
+            await renderer.render(context, c, elem);
+            return { html: elem.innerHTML, dataTime: elem.dataset.time };
+        }
+        test("a date", async () => {
+            const { html, dataTime } = await renderTime("1970-03-05");
+            expect(dataTime).toBe("1970-03-05");
+            expect(html).toContain(`<time datetime="1970-03-05"`);
+            expect(html).not.toContain("time-interval");
+        });
+        test("between x and y", async () => {
+            const { html, dataTime } = await renderTime("1970-03-05/1970-03-09");
+            expect(dataTime).toBe("1970-03-05/1970-03-09");
+            expect(html).toContain(`<span class="time-interval">`);
+            expect(html).toContain(`<time datetime="1970-03-05"`);
+            expect(html).toContain(`<time datetime="1970-03-09"`);
+        });
+        test("years", async () => {
+            const { html } = await renderTime("1966/1993");
+            expect(html).toContain(`<time datetime="1966"`);
+            expect(html).toContain(`<time datetime="1993"`);
+        });
+        test("from x", async () => {
+            const { html, dataTime } = await renderTime("1970-03/..");
+            expect(dataTime).toBe("1970-03/");
+            expect(html).toContain(`<time datetime="1970-03"`);
+            expect(html).toContain(`<span class="time-interval">`);
+        });
+        test("around x", async () => {
+            const { html, dataTime } = await renderTime("~1970-03");
+            expect(dataTime).toBe("~1970-03");
+            expect(html).toContain(`<time datetime="1970-03"`);
+        });
+    });
 });

package/dist/time/datasource/ChronologyReplacer.js

@@ -1,5 +1,6 @@
 import { RR0HttpDatasource } from "./rr0/RR0HttpDatasource.js";
 import { HttpSource } from "./HttpSource.js";
+import { EventTime } from "@rr0/data";
 /**
  * Replaces a (ul) tag from (chronology) files with case summaries from external datasources.
  */
@@ -101,7 +102,7 @@ export class ChronologyReplacer {
         const casesToMerge = sourceCases.map(sourceCase => mapping.mapper.map(context, sourceCase, fetchTime));
         const casesToAdd = [];
         for (const caseToMerge of casesToMerge) {
-            const foundExisting = existingCases.find(existingCase => existingCase.time.isEqual(caseToMerge.time)
+            const foundExisting = existingCases.find(existingCase => EventTime.equals(existingCase.time, caseToMerge.time)
                 && existingCase.place === caseToMerge.place);
             if (foundExisting) {
                 context.logger.debug("Merging ", caseToMerge, " into ", foundExisting);

package/dist/time/datasource/DatasourceTestCase.js

@@ -72,7 +72,7 @@ export class DatasourceTestCase {
         const datasource = this.mapping.datasource;
         const source = expectedSources[0];
         const sourceContext = context.clone();
-        sourceContext.time.date = source.publication.time;
+        sourceContext.time.set(source.publication.time);
         const publicationStr = source.publication ? `, ${this.timeTextBuilder.build(sourceContext)}` : "";
         const indexStr = source.index ? `, ${source.index}` : "";
         const authorStr = datasource.authors.map(authorStr => `<span class="people">${authorStr}</span>`).join(" &amp; ");

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

@@ -6,6 +6,7 @@ import { Level2Date as EdtfDate } from "@rr0/time";
 import { HtmlTag } from "../../../util/html/HtmlTag.js";
 import { RR0Datasource } from "./RR0Datasource.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
+import { EventTime } from "@rr0/data";
 import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";
 import { NamedPlace } from "@rr0/place";
@@ -37,10 +38,12 @@ describe("RR0CaseSource", () => {
             super(mapping, sourceCases);
         }
         getTime(c) {
-            return c.time;
+            return EventTime.start(c.time);
         }
         sortComparator(c1, c2) {
-            return !c1.time || c2.time && c1.time.isBefore(c2.time) ? -1 : !c2.time || c1.time.isAfter(c2.time) ? 1 : 0;
+            const time1 = EventTime.start(c1.time);
+            const time2 = EventTime.start(c2.time);
+            return !time1 || time2 && time1.isBefore(time2) ? -1 : !time2 || time1.isAfter(time2) ? 1 : 0;
         }
         /**
          * Specialization of sources for RR0 cases
@@ -62,7 +65,7 @@ describe("RR0CaseSource", () => {
                     }
                     if (publication.time) {
                         const sourceContext = context.clone();
-                        sourceContext.time.date = source.publication.time;
+                        sourceContext.time.set(source.publication.time);
                         const timeStr = this.timeTextBuilder.build(sourceContext);
                         sourceItems.push(timeStr);
                     }

package/dist/time/datasource/sceau/SceauDatasource.test.js

@@ -60,7 +60,7 @@ describe("SCEAUCaseSource", () => {
                     }
                     if (publication.time) {
                         const sourceContext = context.clone();
-                        sourceContext.time.date = source.publication.time;
+                        sourceContext.time.set(source.publication.time);
                         const timeStr = this.timeTextBuilder.build(sourceContext);
                         sourceItems.push(timeStr);
                     }

package/dist/time/html/TimeReplacer.test.js

@@ -382,6 +382,20 @@ describe("TimeReplacer", async () => {
                 expect((_b = (_a = context.time.date) === null || _a === void 0 ? void 0 : _a.timeshift) === null || _b === void 0 ? void 0 : _b.value, str).toBe(-480);
             }
         });
+        test("a time zone that depends on the date", async () => {
+            var _a, _b;
+            for (const [str, hours] of [["1969-07-20 20:17 (PT)", -7], ["1969-12-20 20:17 PT", -8], ["2009-07-19 05:54 PT", -7]]) {
+                const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+                await render(context, str);
+                expect((_b = (_a = context.time.date) === null || _a === void 0 ? void 0 : _a.timeshift) === null || _b === void 0 ? void 0 : _b.value, str).toBe(hours * 60);
+            }
+        });
+        test("GMT is a time zone", async () => {
+            var _a, _b;
+            const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+            await render(context, "1969-07-20 20:17:40 GMT");
+            expect((_b = (_a = context.time.date) === null || _a === void 0 ? void 0 : _a.timeshift) === null || _b === void 0 ? void 0 : _b.value).toBe(0);
+        });
         test("a sidereal time is not a time zone, and is kept as text", async () => {
             var _a;
             const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.81",
+  "version": "0.3.82",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,10 +31,10 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.9",
     "@rr0/common": "^1.1.5",
-    "@rr0/data": "^0.3.48",
+    "@rr0/data": "^0.3.49",
     "@rr0/lang": "^0.1.13",
     "@rr0/place": "^0.5.4",
-    "@rr0/time": "^2.0.0",
+    "@rr0/time": "^2.2.0",
     "canvas": "^3.2.1",
     "csv-parser": "^3.2.0",
     "glob": "^11.0.3",