@rr0/cms 0.3.73 → 0.3.75

package/dist/tech/info/soft/APIFactory.js

@@ -4,7 +4,7 @@ export class APIFactory extends TypedDataFactory {
         super(eventFactory, "api", ["index"]);
     }
     parse(apiJson) {
-        const events = apiJson.events.map(this.eventFactory.parse);
-        return { type: "api", id: apiJson.id, dirName: apiJson.dirName, url: apiJson.url, events };
+        const events = (apiJson.events || []).map(this.eventFactory.parse);
+        return { type: "api", id: apiJson.id, dirName: apiJson.dirName, title: apiJson.title, url: apiJson.url, events };
     }
 }

package/dist/tech/info/soft/APIFactory.test.d.ts

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

package/dist/tech/info/soft/APIFactory.test.js

@@ -0,0 +1,15 @@
+import { describe, expect, test } from "vitest";
+import { RR0EventFactory } from "@rr0/data";
+import { APIFactory } from "./APIFactory.js";
+describe("APIFactory", () => {
+    const factory = new APIFactory(new RR0EventFactory());
+    test("keeps the title, which becomes the page title", () => {
+        const api = factory.parse({ type: "api", title: "JNLP", url: "https://www.jcp.org/en/jsr/detail?id=56" });
+        expect(api.title).toBe("JNLP");
+        expect(api.url).toBe("https://www.jcp.org/en/jsr/detail?id=56");
+    });
+    test("accepts an api.json without events", () => {
+        const api = factory.parse({ type: "api", title: "JOGL" });
+        expect(api.events).toEqual([]);
+    });
+});

package/dist/time/RR0TimeMessages.d.ts

@@ -31,6 +31,11 @@ export type RR0TimeMessages = {
      * The word that, written right before an interval, asks for it to be rendered as `betweenAnd` ("between", "entre").
      */
     between: RegExp;
+    /**
+     * The words that, written right before a time, need it rendered in full: a relative wording can't follow them
+     * ("en l'année suivante", "in the year after").
+     */
+    preposition: RegExp;
     betweenAnd(startReplacement: string, endReplacement: string): string;
     on(approximate: boolean): string;
     in(approximate: boolean): string;

package/dist/time/RR0TimeMessages_en.d.ts

@@ -31,6 +31,7 @@ export declare class RR0TimeMessages_en implements RR0TimeMessages {
     in: (approximate: boolean) => string;
     fromTo: (startReplacement: string, endReplacement: string) => string;
     between: RegExp;
+    preposition: RegExp;
     betweenAnd: (startReplacement: string, endReplacement: string) => string;
     starting: (approximate: boolean) => string;
 }

package/dist/time/RR0TimeMessages_en.js

@@ -34,6 +34,7 @@ export class RR0TimeMessages_en {
         this.in = (approximate) => (approximate ? "around " : "");
         this.fromTo = (startReplacement, endReplacement) => startReplacement + " to " + endReplacement;
         this.between = /\bbetween\s*$/i;
+        this.preposition = /\b(?:in|on|at|from|to|until|till|since|by|before|after|during|of|for|between|the)\s*$/i;
         this.betweenAnd = (startReplacement, endReplacement) => startReplacement + " and " + endReplacement;
         this.starting = (approximate) => "starting " + (approximate ? "" : "the ");
     }

package/dist/time/RR0TimeMessages_fr.d.ts

@@ -31,6 +31,7 @@ export declare class RR0TimeMessages_fr implements RR0TimeMessages {
     in: (approximate: boolean) => string;
     fromTo: (startReplacement: string, endReplacement: string) => string;
     between: RegExp;
+    preposition: RegExp;
     betweenAnd: (startReplacement: string, endReplacement: string) => string;
     starting: (approximate: boolean) => string;
 }

package/dist/time/RR0TimeMessages_fr.js

@@ -34,6 +34,7 @@ export class RR0TimeMessages_fr {
         this.in = (approximate) => (approximate ? "vers " : "en ");
         this.fromTo = (startReplacement, endReplacement) => `${startReplacement} à ${endReplacement}`;
         this.between = /\bentre\s*$/i;
+        this.preposition = /(?:^|[^\p{L}])(?:(?:en|de|du|des|à|au|aux|jusque|dès|depuis|vers|avant|après|pour|par|fin|début|entre|le|la|les|ce|cet|cette)\s*|(?:d|l|jusqu|qu)['’]\s*|mi-\s*)$/iu;
         this.betweenAnd = (startReplacement, endReplacement) => `${startReplacement} et ${endReplacement}`;
         this.starting = (approximate) => "à partir " + (approximate ? "de " : "du ");
     }

package/dist/time/SsiTitleReplaceCommand.d.ts

@@ -6,10 +6,25 @@ import { HtmlRR0Context } from "../RR0Context.js";
  */
 export declare class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
     protected defaultHandlers: StringContextHandler[];
+    protected static readonly setVarRegex: RegExp;
+    /**
+     * The title set by the file being processed, if any.
+     */
+    protected setTitle: string | undefined;
     /**
      * @param defaultHandlers Will generate a title for a given context/file, if no title is found.
      */
     constructor(defaultHandlers?: StringContextHandler[]);
+    /**
+     * Consumes a `<!--#set var="title" value="..." -->` directive first, as it would otherwise be read only after the
+     * title has been resolved (and then output as a second `<title>` inside the page's body).
+     */
+    execute(context: HtmlRR0Context): Promise<void>;
     protected createReplacer(context: HtmlRR0Context): Promise<RegexReplacer>;
     protected getTitle(context: HtmlRR0Context): string;
+    /**
+     * @return The title implied by a file name: its directory's name for an index page (org/eu/fr/.../paris/index.html
+     * gives "Paris"), its own name otherwise.
+     */
+    protected nameTitle(fileName: string): string;
 }

package/dist/time/SsiTitleReplaceCommand.js

@@ -1,4 +1,6 @@
 import { SsiEchoVarReplaceCommand } from "ssg-api";
+import { StringUtil } from "../util/string/StringUtil.js";
+import path from "path";
 /**
  * Replaces the SSI expression "<!--#echo var="title" -->" by the page's <title> content,
  * with a link if there's a <meta name="url"> content.
@@ -11,6 +13,19 @@ export class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
         super("title");
         this.defaultHandlers = defaultHandlers;
     }
+    /**
+     * Consumes a `<!--#set var="title" value="..." -->` directive first, as it would otherwise be read only after the
+     * title has been resolved (and then output as a second `<title>` inside the page's body).
+     */
+    async execute(context) {
+        const contents = context.file.contents;
+        const match = SsiTitleReplaceCommand.setVarRegex.exec(contents);
+        this.setTitle = match === null || match === void 0 ? void 0 : match[1];
+        if (match) {
+            context.file.contents = contents.replace(match[0], "");
+        }
+        await super.execute(context);
+    }
     async createReplacer(context) {
         return {
             replace: (_match, ..._args) => {
@@ -22,13 +37,23 @@ export class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
         };
     }
     getTitle(context) {
-        let title = context.file.title;
+        let title = context.file.title || this.setTitle;
         if (!title) {
             this.defaultHandlers.some(handle => !title && (title = handle(context)));
         }
         if (!title) {
-            title = context.file.name;
+            title = this.nameTitle(context.file.name);
         }
         return title;
     }
+    /**
+     * @return The title implied by a file name: its directory's name for an index page (org/eu/fr/.../paris/index.html
+     * gives "Paris"), its own name otherwise.
+     */
+    nameTitle(fileName) {
+        const baseName = path.basename(fileName, path.extname(fileName));
+        const name = /^index(_[a-z]{2})?$/.test(baseName) ? path.basename(path.dirname(fileName)) : baseName;
+        return StringUtil.camelToText(name);
+    }
 }
+SsiTitleReplaceCommand.setVarRegex = /<!--\s*#set\s+var="title"\s+value="(.+?)"\s*-->\s*/s;

package/dist/time/TimeService.d.ts

@@ -7,6 +7,10 @@ export declare class TimeService extends AbstractDataService<RR0Event, RR0EventJ
     protected options: TimeOptions;
     readonly timePathRegex: RegExp;
     static readonly defaultRegex: RegExp;
+    /**
+     * A year beyond 4 digits, which has its own directory (time/-10000/index.html).
+     */
+    static readonly yearDirRegex: RegExp;
     constructor(dataService: AllDataService, options: TimeOptions, timePathRegex?: RegExp);
     parseFileName(fileName: string): RegExpExecArray | null;
     titleFromFile(context: HtmlRR0Context, fileName: string, timeTextBuilder: TimeTextBuilder): string | undefined;

package/dist/time/TimeService.js

@@ -22,6 +22,16 @@ export class TimeService extends AbstractDataService {
     }
     contextFromFileName(context, fileName = context.file.name) {
         let timeContext;
+        const yearDirExec = TimeService.yearDirRegex.exec(fileName);
+        if (yearDirExec) {
+            timeContext = context.clone().time;
+            timeContext.setYear(parseInt(yearDirExec[1], 10));
+            timeContext.setMonth(undefined);
+            timeContext.setDayOfMonth(undefined);
+            timeContext.setHour(undefined);
+            timeContext.setMinutes(undefined);
+            return timeContext;
+        }
         let elems;
         if (fileName.endsWith("index.html")) {
             while ((elems = fileName.split("/")).length < 6) {
@@ -64,3 +74,7 @@ export class TimeService extends AbstractDataService {
     }
 }
 TimeService.defaultRegex = /time\/(-)?(\d)\/(\d)\/(\d)\/(\d)\/?(\d{2})?\/?(\d{2})?\/?(index(_[a-z]{2})?.html)?/;
+/**
+ * A year beyond 4 digits, which has its own directory (time/-10000/index.html).
+ */
+TimeService.yearDirRegex = /time\/(-?\d{5,})\/(index(_[a-z]{2})?\.html)?$/;

package/dist/time/TitleReplaceCommand.test.js

@@ -10,9 +10,14 @@ describe("TitleReplaceCommand", () => {
             const command = new SsiTitleReplaceCommand();
             const context = cmsTestUtil.newHtmlContext(fileName, `This is about <!--#echo var="title" -->!`);
             await command.execute(context);
-            const fullPath = cmsTestUtil.filePath(fileName);
-            expect(context.file.title).toBe(fullPath);
-            expect(context.file.contents).toBe(`<html><head><title>${cmsTestUtil.filePath(fileName)}</title></head><body>This is about ${fullPath}!</body></html>`);
+            expect(context.file.title).toBe("4");
+            expect(context.file.contents).toBe(`<html><head><title>4</title></head><body>This is about 4!</body></html>`);
+        });
+        test("year beyond 4 digits", async () => {
+            const command = new SsiTitleReplaceCommand([timeDefaultHandler]);
+            const context = cmsTestUtil.newHtmlContext("time/-10000/index.html", `This is about <!--#echo var="title" -->!`);
+            await command.execute(context);
+            expect(context.file.title).toBe("10000 av. J.-C.");
         });
         test("default title with handler", async () => {
             const command = new SsiTitleReplaceCommand([timeDefaultHandler]);
@@ -21,6 +26,13 @@ describe("TitleReplaceCommand", () => {
             expect(context.file.title).toBe("1954");
             expect(context.file.contents).toBe(`<html><head><title>1954</title></head><body>This is about 1954!</body></html>`);
         });
+        test("title set by a SSI directive prevails over the default handler", async () => {
+            const command = new SsiTitleReplaceCommand([timeDefaultHandler]);
+            const context = cmsTestUtil.newHtmlContext(fileName, `<!--#set var="title" value="Les visiteurs du ciel" -->\nThis is about <!--#echo var="title" -->!`);
+            await command.execute(context);
+            expect(context.file.title).toBe("Les visiteurs du ciel");
+            expect(context.file.contents).toBe(`<html><head><title>Les visiteurs du ciel</title></head><body>This is about Les visiteurs du ciel!</body></html>`);
+        });
         test("default month title with handler", async () => {
             const command = new SsiTitleReplaceCommand([timeDefaultHandler]);
             const context = cmsTestUtil.time.newHtmlContext("1/9/5/4/10/index.html", `This is about <!--#echo var="title" -->!`);
@@ -36,4 +48,10 @@ describe("TitleReplaceCommand", () => {
             expect(context.file.contents).toBe(`<html><head><title>Vendredi 1 octobre 1954</title></head><body>This is about Vendredi 1 octobre 1954!</body></html>`);
         });
     });
+    test("directory name of an index page with no title", async () => {
+        const command = new SsiTitleReplaceCommand([timeDefaultHandler]);
+        const context = cmsTestUtil.newHtmlContext("org/eu/fr/cobeps/index.html", `This is about <!--#echo var="title" -->!`);
+        await command.execute(context);
+        expect(context.file.title).toBe("Cobeps");
+    });
 });

package/dist/time/html/TimeReplacer.js

@@ -33,8 +33,14 @@ export class TimeReplacer {
             const previousContext = origEl.dataset.context === "none" ? undefined : context.clone();
             const timeStr = origEl.textContent;
             const { prefix, value, suffix } = this.completer.split(timeStr);
-            const between = context.messages.context.time.between.test(TimeReplacer.precedingText(origEl) + prefix);
-            const options = { url: true, contentOnly: true, between };
+            const preceding = TimeReplacer.precedingText(origEl) + prefix;
+            const between = context.messages.context.time.between.test(preceding);
+            // "en l'année suivante" is not French: after a preposition, the time is rendered in full
+            const relativeWords = !context.messages.context.time.preposition.test(preceding);
+            // A <time> already inside a link keeps that link: a link of its own would nest <a> in <a>, which the HTML
+            // parser splits, closing the enclosing elements (a note, a source) early.
+            const url = !origEl.closest("a");
+            const options = { url, contentOnly: true, between, relativeWords };
             try {
                 const durations = /^(~?)P([^/]+)\/P?([^/]+)$/.exec(value.trim()); // "P10M/12M"
                 if (durations) {

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

@@ -213,6 +213,30 @@ describe("TimeReplacer", async () => {
         const replacement2 = await replacer.replacement(context, original);
         expect(replacement2.outerHTML).toBe(`<span class="time-resolved"><a href="${cmsTestUtil.time.url("2/0/0/6/")}"><time datetime="${datetime}" title="2006">l'année suivante</time></a></span>`);
     });
+    describe("renders a time in full after a preposition", () => {
+        async function renderAfter(locale, html) {
+            const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "", locale);
+            const p = context.file.document.createElement("p");
+            p.innerHTML = html;
+            const times = p.querySelectorAll("time");
+            let replaced;
+            for (const time of times) {
+                replaced = await replacer.replacement(context, time);
+            }
+            return replaced.textContent;
+        }
+        test("in French", async () => {
+            expect(await renderAfter("fr", "<time>2005</time>. En <time>2006</time>")).toBe("2006");
+            expect(await renderAfter("fr", "<time>2005</time>, jusqu'à <time>2006</time>")).toBe("2006");
+            expect(await renderAfter("fr", "<time>2005</time>, d’<time>2006</time>")).toBe("2006");
+        });
+        test("in English", async () => {
+            expect(await renderAfter("en", "<time>2005</time>. In <time>2006</time>")).toBe("2006");
+        });
+        test("but not without one", async () => {
+            expect(await renderAfter("fr", "<time>2005</time>. Puis, <time>2006</time>")).toBe("l'année suivante");
+        });
+    });
     test("avoids linking to current file", async () => {
         const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
         const timeEl = context.file.document.createElement("time");
@@ -341,6 +365,19 @@ describe("TimeReplacer", async () => {
             const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
             expect(await render(context, "1947-06-24 21:45PST")).toBe("mardi 24 juin 1947 à 21:45");
         });
+        test("time inside a link gets no link of its own", async () => {
+            const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+            const doc = context.file.document;
+            const a = doc.createElement("a");
+            a.href = "/science/crypto/ufo/enquete/dossier/5Novembre/index.html";
+            const timeEl = doc.createElement("time");
+            timeEl.textContent = "2003";
+            a.append(timeEl);
+            doc.body.append(a);
+            const replacement = await replacer.replacement(context, timeEl);
+            expect(replacement.querySelector("a")).toBe(null);
+            expect(replacement.textContent).toBe("2003");
+        });
         test("season does not break the next time", async () => {
             const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
             expect(await render(context, "1990-21")).toBe("printemps 1990");

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.73",
+  "version": "0.3.75",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.9",
     "@rr0/common": "^1.1.5",
-    "@rr0/data": "^0.3.43",
+    "@rr0/data": "^0.3.45",
     "@rr0/lang": "^0.1.13",
     "@rr0/place": "^0.5.4",
     "@rr0/time": "^0.11.3",