@rr0/cms 0.3.5 → 0.3.8

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/org/country/Countries.js

@@ -29,6 +29,7 @@ import { uk } from "../uk/Uk";
 import { usa } from "../us/Usa";
 import { CmsCountry } from "./CmsCountry";
 import { georgia } from "../ge/Georgia";
+import { japan } from "../jp/Japan";
 export const countries = [
     algeria,
     new CmsCountry(CountryCode.ar),
@@ -56,7 +57,7 @@ export const countries = [
     india,
     new CmsCountry(CountryCode.ir),
     new CmsCountry(CountryCode.it),
-    new CmsCountry(CountryCode.jp),
+    japan,
     new CmsCountry(CountryCode.ma),
     mexico,
     mozambique,

package/dist/org/jp/Japan.d.ts

@@ -0,0 +1,2 @@
+import { CmsCountry } from "../country/CmsCountry";
+export declare const japan: CmsCountry;

package/dist/org/jp/Japan.js

@@ -0,0 +1,3 @@
+import { CountryCode } from "@rr0/data";
+import { CmsCountry } from "../country/CmsCountry";
+export const japan = new CmsCountry(CountryCode.jp);

package/dist/people/PeopleReplacer.js

@@ -17,7 +17,7 @@ export class PeopleReplacer {
         peopleStr = peopleStr.trim().replaceAll("\n", "").replace(/  /g, " ");
         let people = this.service.cache.get(peopleStr);
         if (!people) {
-            people = this.service.createFromFullName(peopleStr);
+            people = this.service.createFromTitle(peopleStr);
         }
         let url = people.dirName;
         let replacement;

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

@@ -1,8 +1,13 @@
 import { Place } from "@rr0/place";
 export class OrganizationPlace extends Place {
     constructor(org) {
-        super(org.places[0].locations, org.places[0].elevation, org.places[0].dirName);
+        var _a, _b, _c;
+        super(((_a = org.places[0]) === null || _a === void 0 ? void 0 : _a.locations) || [], (_b = org.places[0]) === null || _b === void 0 ? void 0 : _b.elevation, (_c = org.places[0]) === null || _c === void 0 ? void 0 : _c.dirName);
         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/place/OrganizationPlace.test.d.ts

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

package/dist/place/OrganizationPlace.test.js

@@ -0,0 +1,24 @@
+import { describe, expect, test } from "@javarome/testscript";
+import { OrganizationPlace } from "./OrganizationPlace";
+import { parisCity } from "../org/eu/fr/region/idf/75/paris/Paris";
+import { RR0Datasource } from "../time";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { CountryCode } from "@rr0/data";
+import { CmsCountry } from "../org/country/CmsCountry";
+describe("OrganizationPlace", () => {
+    test("existing organization", async () => {
+        const org = parisCity;
+        const place = new OrganizationPlace(org);
+        expect(place.org).toBe(org);
+        expect(place.locations).toBe(org.places[0].locations);
+    });
+    test("organization with no places", async () => {
+        const org = new CmsCountry(CountryCode.jp);
+        const place = new OrganizationPlace(org);
+        expect(place.org).toBe(org);
+        expect(place.locations).toEqual([]);
+    });
+    test("toString", () => {
+        expect(RR0Datasource.id(EdtfDate.fromString("1972-08-12"), new OrganizationPlace(parisCity))).toBe("1972-08-12$city$75000");
+    });
+});

package/dist/place/PlaceReplacer.test.js

@@ -52,8 +52,7 @@ describe("PlaceReplacer", () => {
         placeTag.innerHTML = text;
         return placeTag;
     }
-    test("link to existing organization", async () => {
-        return; // Disable test
+    test("link to existing organization", { skip: true }, async () => {
         const location = new PlaceLocation(35.8440582, -106.287162);
         const elevation = 2161.025390625;
         const dirName = "org/us/state/nm/lanl/";

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

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