@rr0/cms 0.3.4 → 0.3.5

package/dist/time/datasource/DatasourceTestCase.js

@@ -29,12 +29,12 @@ export class DatasourceTestCase {
         const expected = this.mapping.mapper.map(context, nativeCase, dataDate);
         const time = this.getTime(nativeCase);
         const caseContext = context.clone();
-        Object.assign(caseContext, { time });
+        caseContext.time.date = time;
         const timeStr = this.timeTextBuilder.build(caseContext);
         const placeStr = expected.place ? this.placeRenderer.render(context, expected.place) : "";
         const expectedSources = expected.sources;
         const sourceStr = (expectedSources === null || expectedSources === void 0 ? void 0 : expectedSources.length) > 0 ? this.expectedSourceStr(context, expectedSources, nativeCase) : "";
-        expect(item.innerHTML).toBe(`<time datetime="${time.toString()}">${timeStr}</time>${placeStr}, ${expected.description}${sourceStr}.`);
+        expect(item.innerHTML).toBe(`<span class="time-resolved">${time.day ? "le" : "en"} <time datetime="${time.toString()}">${timeStr}</time></span>${placeStr}, ${expected.description}${sourceStr}.`);
     }
     async testRender(context) {
         const sourceCases = await this.mapping.datasource.fetch(context);

package/dist/time/datasource/rr0/RR0Datasource.d.ts

@@ -1,9 +1,12 @@
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { AbstractDatasource } from "../AbstractDatasource.js";
 import { TimeContextFilter } from "../TimeContextFilter.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { Place } from "@rr0/place";
 export declare class RR0ContextFilter extends TimeContextFilter<RR0CaseSummary> {
 }
 export declare abstract class RR0Datasource extends AbstractDatasource<RR0CaseSummary> {
     static readonly placeRegex: RegExp;
     protected constructor();
+    static id(dateTime: EdtfDate, place: Place | undefined): string;
 }

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

@@ -6,5 +6,9 @@ export class RR0Datasource extends AbstractDatasource {
     constructor() {
         super(["Beau, Jérôme"], "RR0");
     }
+    static id(dateTime, place) {
+        const placeStr = place ? "$" + `${place.id || place.name}` : "";
+        return `${dateTime.toString()}${placeStr}`;
+    }
 }
 RR0Datasource.placeRegex = /^(.+?)(?:\s*\((.+?)(?:\s*,\s*(.+?)(?:\s*,\s*(.+?)))?\))?$/g;

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

@@ -1,12 +1,14 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
+import { beforeEach, describe, expect, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
 import { rr0TestCases } from "./RR0TestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
+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 { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper";
 import { RR0FileDatasource } from "./RR0FileDatasource";
+import { NamedPlace } from "@rr0/place";
 export class RR0TestDatasource extends RR0Datasource {
     constructor() {
         super();
@@ -70,7 +72,7 @@ describe("RR0CaseSource", () => {
                 return " " + HtmlTag.toString("span", authorStr + sourceItems.join(", "), { class: "source" });
             }).join("");
         }
-    }(new RR0TestMapping({ read: ["fetch"], write: [] }), rr0TestCases);
+    }(new RR0TestMapping({ read: ["fetch"], write: [] }).init(rr0TestUtil), rr0TestCases);
     let context;
     beforeEach(() => {
         context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html");
@@ -83,4 +85,8 @@ describe("RR0CaseSource", () => {
     test("render", async () => {
         await testCase.testRender(context);
     });
+    test("id", async () => {
+        const id = RR0Datasource.id(EdtfDate.fromString("1972-08-12"), new NamedPlace("Chatillon"));
+        expect(id).toBe("1972-08-12$Chatillon");
+    });
 });

package/dist/time/datasource/rr0/RR0HttpDatasource.d.ts

@@ -1,7 +1,6 @@
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { HttpSource } from "../HttpSource.js";
 import { RR0Datasource } from "./RR0Datasource.js";
-import { Level2Date as EdtfDate } from "@rr0/time";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { CityService } from "../../../org/index.js";
 import { Source } from "@rr0/data/dist/source";
@@ -12,7 +11,6 @@ export declare class RR0HttpDatasource extends RR0Datasource {
     protected cityService: CityService;
     http: HttpSource;
     constructor(baseUrl: URL, searchPath: string, cityService: CityService);
-    static id(dateTime: EdtfDate, place: Place | undefined): string;
     getFromRows(context: HtmlRR0Context, rows: Element[]): RR0CaseSummary[];
     findRows(doc: HTMLElement): Element[];
     getFromRow(context: HtmlRR0Context, r: Element): RR0CaseSummary;

package/dist/time/datasource/rr0/RR0HttpDatasource.js

@@ -12,9 +12,6 @@ export class RR0HttpDatasource extends RR0Datasource {
         this.cityService = cityService;
         this.http = new HttpSource();
     }
-    static id(dateTime, place) {
-        return `${dateTime.toString()}-${place.id || place.name}`;
-    }
     getFromRows(context, rows) {
         const cases = [];
         for (const row of rows) {

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.4",
+  "version": "0.3.5",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,7 +24,7 @@
     "build": "rm -Rf dist && tsc --project tsconfig.prod.json",
     "prepublishOnly": "npm run build",
     "test": "testscript",
-    "test-one": "rm -Rf out && tsx src/RR0Build.test.ts",
+    "test-one": "rm -Rf out && tsx src/time/datasource/rr0/RR0Datasource.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {