@rr0/cms 0.3.5 → 0.3.6

package/dist/org/CmsOrganization.d.ts

@@ -8,4 +8,5 @@ export declare class CmsOrganization<M extends TitleMessage = OrganizationMessag
     get parent(): CmsOrganization | undefined;
     getMessages(context: RR0Context): M;
     getTitle(context: RR0Context, options?: OrganizationMessageOptions): string;
+    toString(): string;
 }

package/dist/org/CmsOrganization.js

@@ -27,4 +27,7 @@ export class CmsOrganization extends Organization {
         }
         return str;
     }
+    toString() {
+        return this.kind + "$" + this.id;
+    }
 }

package/dist/place/OrganizationPlace.d.ts

@@ -3,4 +3,5 @@ import { Place } from "@rr0/place";
 export declare class OrganizationPlace extends Place {
     readonly org: CmsOrganization;
     constructor(org: CmsOrganization);
+    toString(): string;
 }

package/dist/place/OrganizationPlace.js

@@ -5,4 +5,8 @@ export class OrganizationPlace extends Place {
         this.org = org;
         Object.assign(this, org.places[0]);
     }
+    toString() {
+        var _a, _b;
+        return (_b = (_a = this.org) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : super.toString();
+    }
 }

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

@@ -7,8 +7,8 @@ export class RR0Datasource extends AbstractDatasource {
         super(["Beau, Jérôme"], "RR0");
     }
     static id(dateTime, place) {
-        const placeStr = place ? "$" + `${place.id || place.name}` : "";
-        return `${dateTime.toString()}${placeStr}`;
+        var _a;
+        return `${dateTime.toString()}$${((_a = place === null || place === void 0 ? void 0 : place.toString()) !== null && _a !== void 0 ? _a : "")}`;
     }
 }
 RR0Datasource.placeRegex = /^(.+?)(?:\s*\((.+?)(?:\s*,\s*(.+?)(?:\s*,\s*(.+?)))?\))?$/g;

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

@@ -9,6 +9,8 @@ import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
 import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper";
 import { RR0FileDatasource } from "./RR0FileDatasource";
 import { NamedPlace } from "@rr0/place";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
+import { parisCity } from "../../../org/eu/fr/region/idf/75/paris/Paris";
 export class RR0TestDatasource extends RR0Datasource {
     constructor() {
         super();
@@ -86,7 +88,8 @@ describe("RR0CaseSource", () => {
         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");
+        expect(RR0Datasource.id(EdtfDate.fromString("1972-08-12"), new NamedPlace("Chatillon"))).toBe("1972-08-12$Chatillon");
+        expect(RR0Datasource.id(EdtfDate.fromString("1972-08-12"), new OrganizationPlace(parisCity))).toBe("1972-08-12$city$75000");
+        expect(RR0Datasource.id(EdtfDate.fromString("1972-08-12"), undefined)).toBe("1972-08-12$");
     });
 });

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.5",
+  "version": "0.3.6",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,9 +30,9 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.6",
     "@rr0/common": "^1.1.3",
-    "@rr0/data": "^0.3.5",
+    "@rr0/data": "^0.3.6",
     "@rr0/lang": "^0.1.12",
-    "@rr0/place": "^0.5.1",
+    "@rr0/place": "^0.5.2",
     "@rr0/time": "^0.10.0",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",