@rr0/cms 0.1.13 → 0.1.15

package/dist/time/text/RelativeTimeTextBuilder.js

@@ -0,0 +1,165 @@
+export class RelativeTimeTextBuilder {
+    constructor(timeTextBuilder) {
+        this.timeTextBuilder = timeTextBuilder;
+    }
+    build(oldContext, newContext) {
+        let text;
+        let print = true;
+        const previousTime = oldContext === null || oldContext === void 0 ? void 0 : oldContext.time;
+        if (previousTime === null || previousTime === void 0 ? void 0 : previousTime.isDefined()) {
+            const deltaContext = oldContext.clone();
+            const deltaTime = deltaContext.time;
+            let dayOfMonthDelta;
+            let yearDelta;
+            let monthDelta;
+            let hourDelta;
+            let minutesDelta;
+            function shouldSetDay() {
+                return !previousTime.getMonth() || monthDelta === 0;
+            }
+            function shouldSetHour() {
+                return !previousTime.getDayOfMonth() || dayOfMonthDelta === 0;
+            }
+            function shouldSetMinutes() {
+                return !previousTime.getMinutes() || hourDelta === 0;
+            }
+            function setYear(year) {
+                const previousYear = previousTime.getYear();
+                if (previousYear) {
+                    yearDelta = year - previousYear;
+                    if (yearDelta != 0) {
+                        deltaTime.setYear(year);
+                    }
+                }
+            }
+            function setMonth(month) {
+                const previousMonth = previousTime.getMonth();
+                if (yearDelta === 0) {
+                    monthDelta = month - (previousMonth || 0);
+                    if (monthDelta != 0) {
+                        deltaTime.setMonth(month);
+                    }
+                }
+                else if (yearDelta != 0) {
+                    deltaTime.setMonth(month);
+                }
+            }
+            function setDayOfMonth(dayOfMonth) {
+                const sameMonth = yearDelta === 0 && shouldSetDay();
+                if (sameMonth) {
+                    dayOfMonthDelta = dayOfMonth - (previousTime.getDayOfMonth() || 0);
+                    if (dayOfMonthDelta != 0) {
+                        deltaTime.setDayOfMonth(dayOfMonth);
+                    }
+                }
+                else if (monthDelta != 0) {
+                    deltaTime.setDayOfMonth(dayOfMonth);
+                }
+            }
+            function setHour(hour) {
+                const sameDay = yearDelta === 0 && shouldSetDay() && shouldSetHour();
+                if (sameDay) {
+                    hourDelta = hour - (previousTime.getHour() || 0);
+                    if (hourDelta != 0) {
+                        deltaTime.setHour(hour);
+                    }
+                }
+                else if (dayOfMonthDelta != 0) {
+                    deltaTime.setHour(hour);
+                }
+            }
+            function setMinutes(minutes) {
+                const sameHour = yearDelta === 0 && shouldSetDay() && shouldSetHour() && shouldSetMinutes();
+                if (sameHour) {
+                    minutesDelta = minutes - (previousTime.getMinutes() || 0);
+                    if (minutesDelta != 0) {
+                        deltaTime.setMinutes(minutes);
+                    }
+                }
+                deltaTime.setMinutes(minutes);
+            }
+            const time = newContext.time;
+            const year = time.getYear();
+            if (year) {
+                setYear(year);
+            }
+            const month = time.getMonth();
+            if (month) {
+                setMonth(month);
+            }
+            const dayOfMonth = time.getDayOfMonth();
+            if (dayOfMonth) {
+                setDayOfMonth(dayOfMonth);
+            }
+            const hour = time.getHour();
+            if (hour) {
+                setHour(hour);
+            }
+            const minutes = time.getMinutes();
+            if (minutes) {
+                setMinutes(minutes);
+            }
+            let messages = newContext.messages.context.time.relative;
+            if (dayOfMonthDelta) {
+                switch (dayOfMonthDelta) {
+                    case -1:
+                        text = messages.day.before;
+                        break;
+                    case +1:
+                        text = messages.day.after;
+                        break;
+                }
+            }
+            else {
+                if (!dayOfMonth) {
+                    switch (monthDelta) {
+                        case -1:
+                            text = messages.month.before;
+                            break;
+                        case +1:
+                            text = messages.month.after;
+                            break;
+                    }
+                }
+                if (!month) {
+                    switch (yearDelta) {
+                        case -1:
+                            text = messages.year.before;
+                            break;
+                        case +1:
+                            text = messages.year.after;
+                            break;
+                    }
+                }
+                if (!minutes) {
+                    switch (hourDelta) {
+                        case -1:
+                            text = messages.hour.before;
+                            break;
+                        case +1:
+                            text = messages.hour.after;
+                            break;
+                    }
+                }
+            }
+            if (!text) {
+                let defaultContext;
+                if (deltaContext.time.isDefined()) {
+                    defaultContext = deltaContext;
+                    const dayOfMonth = defaultContext.time.getDayOfMonth();
+                    if (dayOfMonth && shouldSetDay()) {
+                        defaultContext.time.setMonth(newContext.time.getMonth() || previousTime.getMonth(), false); // give month
+                        defaultContext.time.setYear(newContext.time.getYear() || previousTime.getYear(), false); // give year
+                        // context for the day but won't
+                        print = false;
+                    }
+                    newContext = defaultContext;
+                }
+            }
+        }
+        if (!text) {
+            text = this.timeTextBuilder.build(newContext, print);
+        }
+        return text;
+    }
+}

package/dist/time/{TimeTextBuilder.d.ts → text/TimeTextBuilder.d.ts}

@@ -1,4 +1,4 @@
-import { RR0SsgContext } from "../RR0SsgContext.js";
+import { RR0Context } from "../../RR0Context.js";
 export declare class TimeTextBuilder {
     readonly options: Intl.DateTimeFormatOptions;
     constructor(options: Intl.DateTimeFormatOptions);
@@ -9,5 +9,5 @@ export declare class TimeTextBuilder {
      * @param print
      * @param options
      */
-    build(context: RR0SsgContext, print?: boolean, options?: Intl.DateTimeFormatOptions): string;
+    build(context: RR0Context, print: boolean, options?: Intl.DateTimeFormatOptions): string;
 }

package/dist/time/{TimeTextBuilder.js → text/TimeTextBuilder.js}

@@ -9,7 +9,7 @@ export class TimeTextBuilder {
      * @param print
      * @param options
      */
-    build(context, print = true, options = this.options) {
+    build(context, print, options = this.options) {
         const time = context.time;
         const printOptions = {};
         const date = new Date(undefined, undefined, undefined);

package/dist/time/text/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./TimeTextBuilder.js";
+export * from "./RelativeTimeTextBuilder.js";

package/dist/time/text/index.js

@@ -0,0 +1,2 @@
+export * from "./TimeTextBuilder.js";
+export * from "./RelativeTimeTextBuilder.js";

package/dist/value/UnitReplaceCommand.d.ts

@@ -1,9 +1,9 @@
 import { DomReplaceCommand, DomReplacer } from "ssg-api";
-import { HtmlRR0SsgContext } from "../RR0SsgContext.js";
+import { HtmlRR0Context } from "../RR0Context.js";
 /**
  * Register images (`<img>` tags) required in an HTML file.
  */
 export declare class UnitReplaceCommand extends DomReplaceCommand {
     constructor();
-    protected createReplacer(context: HtmlRR0SsgContext): Promise<DomReplacer>;
+    protected createReplacer(context: HtmlRR0Context): Promise<DomReplacer>;
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@rr0/cms",
   "type": "module",
-  "author": "rr0@rr0.org",
-  "version": "0.1.13",
-  "description": "Content Management System",
+  "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
+  "version": "0.1.15",
+  "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=20"
   },
   "license": "MIT",
-  "homepage": "https://github.com/RR0/cms",
+  "homepage": "https://github.com/RR0/cms#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/RR0/cms.git"
@@ -20,34 +20,37 @@
     "build": "rm -Rf dist && tsc --project tsconfig.prod.json",
     "prepublishOnly": "npm run build",
     "test": "testscript",
-    "test-one": "rm -Rf out && tsx src/time/datasource/essex-police/EssexPoliceDatasource.test.ts",
+    "test-one": "rm -Rf out && tsx src/time/RelativeTimeTextBuilder.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
     "@googlemaps/google-maps-services-js": "^3.4.0",
-    "@rr0/common": "^1.0.1",
-    "@rr0/lang": "^0.1.11",
-    "@rr0/time": "^0.5.0",
+    "@rr0/common": "^1.1.3",
+    "@rr0/lang": "^0.1.12",
+    "@rr0/time": "^0.7.7",
+    "@rr0/place": "^0.3.1",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",
     "glob": "^11.0.0",
     "image-size": "^1.1.1",
     "jsdom": "^24.1.0",
     "selenium-webdriver": "^4.22.0",
-    "ssg-api": "^1.16.1"
+    "ssg-api": "^1.16.3"
   },
   "devDependencies": {
     "@types/jsdom": "^21.1.7",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.3",
     "@types/node": "^22.7.4",
     "tsx": "4.17.0",
-    "@javarome/testscript": "^0.10.7"
+    "@javarome/testscript": "^0.13.0"
   },
   "keywords": [
     "cms",
     "time",
     "place",
-    "organization"
+    "people",
+    "organization",
+    "event"
   ],
   "publishConfig": {
     "access": "public"

package/tsconfig.json

@@ -14,7 +14,8 @@
     "baseUrl": "./src",
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true
   },
   "include": [
     "src"

package/dist/place/PlaceLocation.d.ts

@@ -1,26 +0,0 @@
-import { RR0SsgContext } from "../RR0SsgContext.js";
-export type DMS = {
-    deg: number;
-    min: number;
-    sec: number;
-    positive: boolean;
-};
-export declare class PlaceLocation {
-    readonly lat: number;
-    readonly lng: number;
-    static readonly DMS_PATTERN: RegExp;
-    /**
-     *
-     * @param {float} lat Latitude in decimal degrees. North is positive.
-     * @param {float} lng Longitude in decimal degrees. East is positive.
-     */
-    constructor(lat: number, lng: number);
-    /**
-     *
-     * @param dms A string with deg°minutes"seconds'N|S|E|O format
-     */
-    static fromDMS(dms: string): PlaceLocation;
-    static fromDouble(double: number): DMS;
-    protected static toDouble(m: RegExpExecArray, offset: number): number;
-    toDMS(context: RR0SsgContext): string;
-}

package/dist/place/PlaceLocation.js

@@ -1,48 +0,0 @@
-import assert from "assert";
-export class PlaceLocation {
-    /**
-     *
-     * @param {float} lat Latitude in decimal degrees. North is positive.
-     * @param {float} lng Longitude in decimal degrees. East is positive.
-     */
-    constructor(lat, lng) {
-        this.lat = lat;
-        this.lng = lng;
-    }
-    /**
-     *
-     * @param dms A string with deg°minutes"seconds'N|S|E|O format
-     */
-    static fromDMS(dms) {
-        const m = PlaceLocation.DMS_PATTERN.exec(dms.trim());
-        assert.ok(m, `Malformed degrees/minutes/seconds/direction coordinates in "${dms}"`);
-        const latitude = PlaceLocation.toDouble(m, 0);
-        const longitude = PlaceLocation.toDouble(m, 5);
-        assert.ok(Math.abs(latitude) <= 90, `Invalid latitude ${latitude}`);
-        assert.ok(Math.abs(longitude) <= 180, `Invalid longitude ${longitude}`);
-        return new PlaceLocation(latitude, longitude);
-    }
-    static fromDouble(double) {
-        const positive = double >= 0;
-        const value = Math.abs(double);
-        const deg = Math.trunc(value);
-        const minFloat = (value - deg) * 60;
-        const min = Math.trunc(minFloat);
-        const sec = Math.round((minFloat - min) * 60);
-        return { deg, min, sec, positive };
-    }
-    static toDouble(m, offset) {
-        const sign = "" === m[1 + offset] ? 1 : -1;
-        const degrees = parseFloat(m[2 + offset]);
-        const minutes = parseFloat(m[3 + offset]) || 0;
-        const seconds = parseFloat(m[4 + offset]) || 0;
-        const direction = "NE".includes(m[5 + offset]) ? 1 : -1;
-        return sign * direction * (degrees + minutes / 60 + seconds / 3600);
-    }
-    toDMS(context) {
-        const placeMsg = context.messages.place;
-        return placeMsg.dmsLat(PlaceLocation.fromDouble(this.lat)) + ","
-            + placeMsg.dmsLng(PlaceLocation.fromDouble(this.lng));
-    }
-}
-PlaceLocation.DMS_PATTERN = /(-?)([0-9]{1,2})°\s*([0-5]?[0-9])[′'](?:\s*([0-5]?[0-9])[″"])?\s*([NS])\s*[, ]\s*(-?)([0-1]?[0-9]{1,2})°\s*([0-9]?[0-9])[′'](?:\s*([0-5]?[0-9])["″])?\s*([EWO])/;

package/dist/place/PlaceMessages.d.ts

@@ -1,5 +0,0 @@
-import { DMS } from "./PlaceLocation.js";
-export interface PlaceMessages {
-    dmsLat: (dms: DMS) => string;
-    dmsLng: (dms: DMS) => string;
-}

package/dist/place/PlaceMessages_en.d.ts

@@ -1,2 +0,0 @@
-import { PlaceMessages } from "./PlaceMessages.js";
-export declare const placeMessages_en: PlaceMessages;

package/dist/place/PlaceMessages_en.js

@@ -1,4 +0,0 @@
-export const placeMessages_en = {
-    dmsLat: (dms) => `${dms.deg}°${dms.min}′${dms.sec}″${dms.positive ? "N" : "S"}`,
-    dmsLng: (dms) => `${dms.deg}°${dms.min}′${dms.sec}″${dms.positive ? "E" : "W"}`
-};

package/dist/place/PlaceMessages_fr.d.ts

@@ -1,2 +0,0 @@
-import { PlaceMessages } from "./PlaceMessages.js";
-export declare const placeMessages_fr: PlaceMessages;

package/dist/place/PlaceMessages_fr.js

@@ -1,4 +0,0 @@
-export const placeMessages_fr = {
-    dmsLat: (dms) => `${dms.deg}°${dms.min}′${dms.sec}″${dms.positive ? "N" : "S"}`,
-    dmsLng: (dms) => `${dms.deg}°${dms.min}′${dms.sec}″${dms.positive ? "E" : "O"}`
-};

package/dist/time/RelativeTimeTextBuilder.js

@@ -1,166 +0,0 @@
-export class RelativeTimeTextBuilder {
-    constructor(timeTextBuilder) {
-        this.timeTextBuilder = timeTextBuilder;
-    }
-    build(oldContext, newContext) {
-        const previousTime = oldContext === null || oldContext === void 0 ? void 0 : oldContext.time;
-        if (!(previousTime === null || previousTime === void 0 ? void 0 : previousTime.isDefined())) {
-            return this.timeTextBuilder.build(newContext);
-        }
-        const deltaContext = oldContext.clone();
-        const deltaTime = deltaContext.time;
-        let dayOfMonthDelta;
-        let yearDelta;
-        let monthDelta;
-        let hourDelta;
-        let minutesDelta;
-        function shouldSetDay() {
-            return !previousTime.getMonth() || monthDelta === 0;
-        }
-        function shouldSetHour() {
-            return !previousTime.getDayOfMonth() || dayOfMonthDelta === 0;
-        }
-        function shouldSetMinutes() {
-            return !previousTime.getMinutes() || hourDelta === 0;
-        }
-        function setYear(year) {
-            const previousYear = previousTime.getYear();
-            if (previousYear) {
-                yearDelta = year - previousYear;
-                if (yearDelta != 0) {
-                    deltaTime.setYear(year);
-                }
-            }
-        }
-        function setMonth(month) {
-            const previousMonth = previousTime.getMonth();
-            if (yearDelta === 0) {
-                monthDelta = month - (previousMonth || 0);
-                if (monthDelta != 0) {
-                    deltaTime.setMonth(month);
-                }
-            }
-            else if (yearDelta != 0) {
-                deltaTime.setMonth(month);
-            }
-        }
-        function setDayOfMonth(dayOfMonth) {
-            const sameMonth = yearDelta === 0 && shouldSetDay();
-            if (sameMonth) {
-                dayOfMonthDelta = dayOfMonth - (previousTime.getDayOfMonth() || 0);
-                if (dayOfMonthDelta != 0) {
-                    deltaTime.setDayOfMonth(dayOfMonth);
-                }
-            }
-            else if (monthDelta != 0) {
-                deltaTime.setDayOfMonth(dayOfMonth);
-            }
-        }
-        function setHour(hour) {
-            const sameDay = yearDelta === 0 && shouldSetDay() && shouldSetHour();
-            if (sameDay) {
-                hourDelta = hour - (previousTime.getHour() || 0);
-                if (hourDelta != 0) {
-                    deltaTime.setHour(hour);
-                }
-            }
-            else if (dayOfMonthDelta != 0) {
-                deltaTime.setHour(hour);
-            }
-        }
-        function setMinutes(minutes) {
-            const sameHour = yearDelta === 0 && shouldSetDay() && shouldSetHour() && shouldSetMinutes();
-            if (sameHour) {
-                minutesDelta = minutes - (previousTime.getMinutes() || 0);
-                if (minutesDelta != 0) {
-                    deltaTime.setMinutes(minutes);
-                }
-            }
-            deltaTime.setMinutes(minutes);
-        }
-        const time = newContext.time;
-        const year = time.getYear();
-        if (year) {
-            setYear(year);
-        }
-        const month = time.getMonth();
-        if (month) {
-            setMonth(month);
-        }
-        const dayOfMonth = time.getDayOfMonth();
-        if (dayOfMonth) {
-            setDayOfMonth(dayOfMonth);
-        }
-        const hour = time.getHour();
-        if (hour) {
-            setHour(hour);
-        }
-        const minutes = time.getMinutes();
-        if (minutes) {
-            setMinutes(minutes);
-        }
-        let text;
-        let messages = newContext.messages.context.time.relative;
-        if (dayOfMonthDelta) {
-            switch (dayOfMonthDelta) {
-                case -1:
-                    text = messages.day.before;
-                    break;
-                case +1:
-                    text = messages.day.after;
-                    break;
-            }
-        }
-        else {
-            if (!dayOfMonth) {
-                switch (monthDelta) {
-                    case -1:
-                        text = messages.month.before;
-                        break;
-                    case +1:
-                        text = messages.month.after;
-                        break;
-                }
-            }
-            if (!month) {
-                switch (yearDelta) {
-                    case -1:
-                        text = messages.year.before;
-                        break;
-                    case +1:
-                        text = messages.year.after;
-                        break;
-                }
-            }
-            if (!minutes) {
-                switch (hourDelta) {
-                    case -1:
-                        text = messages.hour.before;
-                        break;
-                    case +1:
-                        text = messages.hour.after;
-                        break;
-                }
-            }
-        }
-        if (!text) {
-            let print = true;
-            let defaultContext;
-            if (deltaContext.time.isDefined()) {
-                defaultContext = deltaContext;
-                const dayOfMonth = defaultContext.time.getDayOfMonth();
-                if (dayOfMonth && shouldSetDay()) {
-                    defaultContext.time.setMonth(newContext.time.getMonth() || previousTime.getMonth(), false); // give month
-                    defaultContext.time.setYear(newContext.time.getYear() || previousTime.getYear(), false); // give year
-                    // context for the day but won't
-                    print = false;
-                }
-            }
-            else {
-                defaultContext = newContext;
-            }
-            text = this.timeTextBuilder.build(defaultContext, print);
-        }
-        return text;
-    }
-}

package/dist/time/TimeContext.d.ts

@@ -1,59 +0,0 @@
-import { HtmlRR0SsgContext } from "../RR0SsgContext.js";
-import { TimeParseResult } from "./TimeReplacer.js";
-import { Level2Date as EdtfDate, Level2Duration as EdtfDuration, Level2Interval as EdtfInterval } from "@rr0/time";
-/**
- * Time context for a RR0 page.
- */
-export declare class TimeContext {
-    static readonly dateTimeRegexp: RegExp;
-    static readonly MINUTE = 60;
-    static readonly HOUR: number;
-    static readonly DAY: number;
-    date: EdtfDate | undefined;
-    interval: EdtfInterval | undefined;
-    duration: EdtfDuration | undefined;
-    constructor(_year?: number, _month?: number, _dayOfMonth?: number, _hour?: number, _minutes?: number, _timeZone?: string, approximate?: boolean, approximateTime?: boolean, 
-    /** @deprecated */
-    from?: TimeContext | undefined, 
-    /** @deprecated */
-    to?: TimeContext | undefined, duration?: number | undefined);
-    get from(): EdtfDate | undefined;
-    get to(): EdtfDate | undefined;
-    get approximate(): boolean;
-    set approximate(approx: boolean);
-    get approximateTime(): boolean;
-    static parseDateTime(timeStr: string): TimeParseResult;
-    static fromString(timeStr: string): TimeContext;
-    static fromDate(date: Date): TimeContext;
-    static fromFileName(context: HtmlRR0SsgContext, fileName?: string): TimeContext | undefined;
-    /**
-     * @param {string} timeStr
-     * @return If the string could be parsed
-     */
-    updateFromStr(timeStr: string): boolean;
-    getYear(): number | undefined;
-    setYear(year: number | undefined, print?: boolean): this;
-    getMonth(): number | undefined;
-    setMonth(month: number | undefined, print?: boolean): this;
-    getDayOfMonth(): number | undefined;
-    setDayOfMonth(dayOfMonth: number | undefined, print?: boolean): this;
-    getHour(): number | undefined;
-    setHour(hour: number | undefined, print?: boolean): this;
-    getMinutes(): number | undefined;
-    setMinutes(minutes: number | undefined): this;
-    /**
-     * @deprecated
-     */
-    getTimeZone(): string | undefined;
-    getTimeshift(): string | undefined;
-    setTimeZone(timeZone: string | undefined): this;
-    isDefined(): boolean;
-    clone(): TimeContext;
-    reset(): this;
-    isBefore(other: TimeContext): boolean;
-    isAfter(other: TimeContext): boolean;
-    equals(other: TimeContext): boolean;
-    toString(): string;
-    toJSON(): string;
-    protected isSet(value: any): boolean;
-}