@rr0/cms 0.1.24 → 0.2.1

package/dist/org/us/region/pr/PuertoRico.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/pr/kalamazoo/Kalamazoo.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { puertoRico } from "../PuertoRico.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const kalamazoo = Department.create(UsaCountyCode.kalamazoo, puertoRico, Place.fromDMS("42°14′N,85°32′W"));

package/dist/org/us/region/pr/kalamazoo/galesburg/Galesburg.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { kalamazoo } from "../Kalamazoo.js";
 import { KalamazooCityCode } from "../KalamazooCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/sc/SouthCarolina.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/sc/kalamazoo/Kalamazoo.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { southCarolina } from "../SouthCarolina.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const kalamazoo = Department.create(UsaCountyCode.kalamazoo, southCarolina, Place.fromDMS("42°14′N,85°32′W"));

package/dist/org/us/region/sc/kalamazoo/galesburg/Galesburg.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { kalamazoo } from "../Kalamazoo.js";
 import { KalamazooCityCode } from "../KalamazooCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/tx/Texas.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
 export const texas = usaRegion(UsaStates.tx, Place.fromDMS("32°45′23″N 97°19′57″W"));

package/dist/org/us/region/tx/Texas_en.js

@@ -1,8 +1,8 @@
 import { tarrant_en } from "./tarrant/Tarrant_en.js";
 import { RegionMessages } from "../../../country/index.js";
-import { OrganizationKind } from "../../../Organization.js";
 import { houstonMessages } from "./houston/HoustonMessages.js";
 import { houstonCityCode } from "./houston/Houston.js";
+import { OrganizationKind } from "../../../OrganizationKind";
 const texasCityMessages = {
     [houstonCityCode]: houstonMessages
 };

package/dist/org/us/region/tx/Texas_fr.js

@@ -2,7 +2,7 @@ import { RegionMessages } from "../../../country/index.js";
 import { tarrant_fr } from "./tarrant/Tarrant_fr.js";
 import { houstonCityCode } from "./houston/Houston.js";
 import { houstonMessages } from "./houston/HoustonMessages.js";
-import { OrganizationKind } from "../../../Organization.js";
+import { OrganizationKind } from "../../../OrganizationKind";
 const texasCityMessages = {
     [houstonCityCode]: houstonMessages
 };

package/dist/org/us/region/tx/houston/Houston.js

@@ -1,5 +1,5 @@
 import { texas } from "../Texas.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { usaCity } from "../../UsaCity.js";
 export const houstonCityCode = "48-35000";
 export let houston = usaCity(houstonCityCode, texas, Place.fromDMS("29°45′46″N 95°22′59″W"));

package/dist/org/us/region/tx/tarrant/Tarrant.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { texas } from "../Texas.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const tarrant = Department.create(UsaCountyCode.tarrant, texas, Place.fromDMS("32°46′N 97°17′W"));

package/dist/org/us/region/tx/tarrant/fortworth/FortWorth.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { tarrant } from "../Tarrant.js";
 import { usaCity } from "../../../UsaCity.js";
 export let fortWorth = usaCity("76133", tarrant, Place.fromDMS("32°45′23″N 97°19′57″W"));

package/dist/org/us/region/ut/Utah.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/ut/uintah/Uintah.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { utah } from "../Utah.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const uintah = Department.create(UsaCountyCode.uintah, utah, Place.fromDMS("40°08′N,109°31′W"));

package/dist/org/us/region/ut/uintah/skinwalker/Skinwalker.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { uintah } from "../Uintah.js";
 import { UintahCityCode } from "../UintahCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/va/Virginia.js

@@ -1,5 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place, PlaceLocation } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
-import { PlaceLocation } from "@rr0/place";
 export const virginia = usaRegion(UsaStates.va, new Place([PlaceLocation.fromDMS("38°0'N, 79°0'W")]));

package/dist/org/us/region/va/Virginia_en.js

@@ -1,8 +1,8 @@
 import { RegionMessages } from "../../../country/index.js";
 import { arlington_en } from "./arlington/Arlington_en.js";
-import { OrganizationKind } from "../../../Organization.js";
 import { bristolCityCode } from "./bristol/Bristol.js";
 import { bristolMessages } from "./bristol/BristolMessages.js";
+import { OrganizationKind } from "../../../OrganizationKind";
 export const virginia_en = RegionMessages.create("Virginia state", {
     arlington: arlington_en
 });

package/dist/org/us/region/va/Virginia_fr.js

@@ -1,8 +1,8 @@
 import { RegionMessages } from "../../../country/index.js";
 import { arlington_fr } from "./arlington/Arlington_fr.js";
-import { OrganizationKind } from "../../../Organization.js";
 import { bristolCityCode } from "./bristol/Bristol.js";
 import { bristolMessages } from "./bristol/BristolMessages.js";
+import { OrganizationKind } from "../../../OrganizationKind";
 export const virginia_fr = RegionMessages.create("État de Virginie", {
     arlington: arlington_fr
 });

package/dist/org/us/region/va/arlington/Arlington.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { Department } from "../../../../country/region/department/Department.js";
 import { virginia } from "../Virginia.js";
 import { VirginiaCountyCode } from "../VirginiaCountyCode.js";

package/dist/org/us/region/va/arlington/pentagon/Pentagon.js

@@ -1,5 +1,5 @@
 import { arlington } from "../Arlington.js";
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { City } from "../../../../../country/region/department/city/City.js";
 import { ArlingtonCityCode } from "../ArlingtonCityCode.js";
 export let pentagon = new City(ArlingtonCityCode.Pentagon, arlington, [Place.fromDMS("38°52′15″N,77°03′18″W")]);

package/dist/org/us/region/va/bristol/Bristol.js

@@ -1,5 +1,5 @@
 import { City } from "../../../../country/region/department/city/City.js";
 import { virginia } from "../Virginia.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 export const bristolCityCode = "bristolVA";
 export let bristol = new City(bristolCityCode, virginia, [Place.fromDMS("36°36′N,82°11′W")]);

package/dist/org/us/region/vi/VirginIslands.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/vi/stthomas/CharlotteAmalie/CharlotteAmalie.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { stThomas } from "../StThomas.js";
 import { StThomasCityCode } from "../StThomasCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/vi/stthomas/StThomas.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { virginIslands } from "../VirginIslands.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const stThomas = Department.create(UsaCountyCode.stThomas, virginIslands, Place.fromDMS("18°20′00″N,64°55′00″W"));

package/dist/org/us/region/vt/Vermont.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/vt/rutland/Rutland/Rutland.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { rutlandCounty } from "../Rutland.js";
 import { RutlandCityCode } from "../RutlandCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/vt/rutland/Rutland.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { vermont } from "../Vermont.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const rutlandCounty = Department.create(UsaCountyCode.rutland, vermont, Place.fromDMS("43°34′48″N 73°02′12″W"));

package/dist/org/us/region/wa/Washington.js

@@ -1,5 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place, PlaceLocation } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
-import { PlaceLocation } from "@rr0/place";
 export const washington = usaRegion(UsaStates.wa, new Place([PlaceLocation.fromDMS("45°33′ N,116°55′ W"), PlaceLocation.fromDMS("49°0' N,124°46′ W")]));

package/dist/org/us/region/wa/pierce/Pierce.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { washington } from "../Washington.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const pierce = Department.create(UsaCountyCode.pierce, washington, Place.fromDMS("47°03′N 122°07′W"));

package/dist/org/us/region/wa/pierce/bonneylake/BonneyLake.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { PierceCityCode } from "../PierceCityCode.js";
 import { pierce } from "../Pierce.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/wi/Wisconsin.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/wi/dane/Dane.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { wisconsin } from "../Wisconsin.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const dane = Department.create(UsaCountyCode.dane, wisconsin, Place.fromDMS("43°04′N 89°25′W"));

package/dist/org/us/region/wi/dane/Madison/Madison.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { dane } from "../Dane.js";
 import { DaneCityCode } from "../DaneCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/wv/WestVirginia.js

@@ -1,5 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place, PlaceLocation } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
-import { PlaceLocation } from "@rr0/place";
 export const westVirginia = usaRegion(UsaStates.wv, new Place([PlaceLocation.fromDMS("38°51′27″N,82°7′43″W")]));

package/dist/org/us/region/wv/fayette/Fayette.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { westVirginia } from "../WestVirginia.js";
 import { Department } from "../../../../country/region/department/Department.js";
 import { WestVirginiaCountyCode } from "../WestVirginiaCountyCode.js";

package/dist/org/us/region/wv/fayette/MountHope/MountHope.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { FayetteCityCode } from "../FayetteCityCode.js";
 import { fayette } from "../Fayette.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/wv/mason/Mason.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { westVirginia } from "../WestVirginia.js";
 import { Department } from "../../../../country/region/department/Department.js";
 import { WestVirginiaCountyCode } from "../WestVirginiaCountyCode.js";

package/dist/org/us/region/wv/mason/PointPleasant/PointPleasant.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { MasonCityCode } from "../MasonCityCode.js";
 import { mason } from "../Mason.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/org/us/region/wy/Wyoming.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usa } from "../../Usa.js";
 import { Region } from "../../../country/index.js";

package/dist/org/us/region/wy/carbon/Carbon.js

@@ -1,5 +1,5 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { wyoming } from "../Wyoming.js";
 import { Department } from "../../../../country/region/department/Department.js";
 export const carbon = Department.create(UsaCountyCode.carbon, wyoming, Place.fromDMS("41°41′N 106°56′W"));

package/dist/org/us/region/wy/carbon/Rawlins/Rawlins.js

@@ -1,4 +1,4 @@
-import { Place } from "../../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { carbon } from "../Carbon.js";
 import { CarbonCityCode } from "../CarbonCityCode.js";
 import { usaCity } from "../../../UsaCity.js";

package/dist/people/People.d.ts

@@ -2,6 +2,7 @@ import { Occupation } from "./Occupation.js";
 import { Gender } from "@rr0/common";
 import { CountryCode } from "../org/country/CountryCode.js";
 import { RR0Data, RR0Event } from "@rr0/data";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export declare class People implements RR0Data {
     firstNames: string[];
     lastName: string;
@@ -12,11 +13,6 @@ export declare class People implements RR0Data {
      * The people has been caught lying or has confessed a hoax.
      */
     readonly discredited: boolean;
-    /**
-     * @deprecated Use a "birth"-typed sub-data instead.
-     */
-    birthTime?: Date;
-    deathTime?: Date;
     readonly gender?: Gender;
     readonly id: string;
     readonly dirName?: string;
@@ -39,14 +35,15 @@ export declare class People implements RR0Data {
     /**
      * @deprecated Use a "birth"-typed sub-data instead.
      */
-    birthTime?: Date, deathTime?: Date, gender?: Gender, id?: string, dirName?: string, image?: string, url?: string, events?: RR0Event[]);
+    birthTime?: EdtfDate, deathTime?: EdtfDate, gender?: Gender, id?: string, dirName?: string, image?: string, url?: string, events?: RR0Event[]);
+    get birthTime(): EdtfDate;
+    get deathTime(): EdtfDate;
     get firstAndLastName(): string;
-    static toYears(timeMs: number): number;
     static getUrl(lastName: string, firstNames: string[]): string;
     getLastAndFirstName(): string;
-    isDeceased(from?: Date): boolean;
-    getAge(from?: Date): number | undefined;
-    probablyDead(birth: Date, at?: Date): boolean;
+    isDeceased(from?: EdtfDate): boolean;
+    getAge(from?: EdtfDate): number | undefined;
+    probablyDead(birth: EdtfDate, at?: EdtfDate): boolean;
     clone(): People;
     protected getLastAndFirstNames(): {
         lastNameStr: string;

package/dist/people/People.js

@@ -1,4 +1,5 @@
 import { StringUtil } from "../util/string/StringUtil.js";
+import { Level2Date as EdtfDate, Level2Duration as Duration } from "@rr0/time";
 export class People {
     constructor(firstNames = [], lastName = "", pseudonyms = [], occupations = [], countries = [], 
     /**
@@ -15,8 +16,6 @@ export class People {
         this.occupations = occupations;
         this.countries = countries;
         this.discredited = discredited;
-        this.birthTime = birthTime;
-        this.deathTime = deathTime;
         this.gender = gender;
         this.id = id;
         this.dirName = dirName;
@@ -31,18 +30,29 @@ export class People {
         this.lastAndFirstName = this.getLastAndFirstName();
         this.title = this.firstAndLastName;
         this.name = this.lastName;
+        if (!this.birthTime && birthTime) {
+            events.push({ type: "event", eventType: "birth", time: birthTime, events: [] });
+        }
+        if (!this.deathTime && deathTime) {
+            events.push({ type: "event", eventType: "death", time: deathTime, events: [] });
+        }
+    }
+    get birthTime() {
+        var _a;
+        return (_a = this.events.find(event => event.eventType === "birth")) === null || _a === void 0 ? void 0 : _a.time;
+    }
+    get deathTime() {
+        var _a;
+        return (_a = this.events.find(event => event.eventType === "death")) === null || _a === void 0 ? void 0 : _a.time;
     }
     get firstAndLastName() {
         const { lastNameStr, firstNameStr } = this.getLastAndFirstNames();
         return lastNameStr && firstNameStr ? firstNameStr + " " + lastNameStr : lastNameStr || firstNameStr;
     }
-    static toYears(timeMs) {
-        return timeMs / 1000 / 60 / 60 / 24 / 365;
-    }
     static getUrl(lastName, firstNames) {
         const normalizedLastName = StringUtil.removeAccents(lastName);
         const normalizedFirstNames = firstNames.map(StringUtil.removeAccents).map(StringUtil.withoutDots);
-        return "people/" + normalizedLastName.charAt(0).toLowerCase() + "/" + normalizedLastName + normalizedFirstNames.join("");
+        return `people/${normalizedLastName.charAt(0).toLowerCase()}/${normalizedLastName}${normalizedFirstNames.join("")}`;
     }
     getLastAndFirstName() {
         const { lastNameStr, firstNameStr } = this.getLastAndFirstNames();
@@ -60,26 +70,25 @@ export class People {
         }
     }
     getAge(from) {
-        var _a;
         if (this.birthTime) {
             let timeDelta;
             if (this.deathTime) {
-                timeDelta = this.deathTime.getTime() - this.birthTime.getTime();
+                timeDelta = Duration.between(this.birthTime, this.deathTime);
             }
             else if (!this.probablyDead(this.birthTime)) {
-                const now = (_a = from === null || from === void 0 ? void 0 : from.getTime()) !== null && _a !== void 0 ? _a : new Date().getTime();
-                timeDelta = now - this.birthTime.getTime();
+                const now = from !== null && from !== void 0 ? from : new EdtfDate();
+                timeDelta = Duration.between(this.birthTime, now);
             }
             else {
                 return undefined;
             }
-            return Math.floor(People.toYears(timeDelta));
+            return timeDelta.toSpec().years.value;
         }
     }
     probablyDead(birth, at) {
-        var _a;
-        const now = (_a = at === null || at === void 0 ? void 0 : at.getTime()) !== null && _a !== void 0 ? _a : new Date().getTime();
-        return People.toYears(now - birth.getTime()) > 120;
+        const now = at !== null && at !== void 0 ? at : new EdtfDate();
+        const timeDelta = Duration.between(birth, now);
+        return timeDelta.toSpec().years.value > 120;
     }
     clone() {
         return new People(this.firstNames, this.lastName, this.pseudonyms, this.occupations, this.countries, this.discredited, this.birthTime, this.deathTime, this.gender, this.id, this.dirName, this.image, this.url, this.events);

package/dist/people/People.test.js

@@ -4,6 +4,7 @@ import { describe, expect, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../test/index.js";
 import path from "path";
 import { AllDataService } from "@rr0/data";
+import { Level2Date as EdtfDate } from "@rr0/time";
 describe("People", () => {
     const peopleRoot = "src/people";
     const peopleFiles = [
@@ -17,14 +18,14 @@ describe("People", () => {
         const [hynek] = await service.getFromDir("HynekJosefAllen");
         expect(hynek.isDeceased()).toBe(false);
         expect(hynek.getAge()).toBe(undefined);
-        hynek.birthTime = new Date("1910-05-01");
+        Object.assign(hynek, { birthTime: EdtfDate.fromString("1910-05-01") });
         expect(hynek.isDeceased()).toBe(false);
-        expect(hynek.isDeceased(new Date("2040"))).toBe(true);
-        expect(hynek.getAge(new Date("1972-08-12"))).toBe(62);
-        hynek.deathTime = new Date("1986-04-27");
+        expect(hynek.isDeceased(EdtfDate.fromString("2040"))).toBe(true);
+        expect(hynek.getAge(EdtfDate.fromString("1972-08-12"))).toBe(62);
+        Object.assign(hynek, { deathTime: EdtfDate.fromString("1986-04-27") });
         expect(hynek.isDeceased()).toBe(true);
-        expect(hynek.getAge(new Date("1986-04-27"))).toBe(76);
-        expect(hynek.getAge(new Date("2020-04-27"))).toBe(76);
+        expect(hynek.getAge(EdtfDate.fromString("1986-04-27"))).toBe(76);
+        expect(hynek.getAge(EdtfDate.fromString("2020-04-27"))).toBe(76);
     });
     test("build url", () => {
         expect(People.getUrl("Beau", ["Jérôme"])).toBe("people/b/BeauJerome");

package/dist/people/PeopleFactory.d.ts

@@ -1,6 +1,7 @@
 import { People } from "./People.js";
-import { RR0Data, RR0EventFactory, TypedDataFactory } from "@rr0/data";
-export declare class PeopleFactory extends TypedDataFactory<People> {
+import { RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { PeopleJson } from "./PeopleJson";
+export declare class PeopleFactory extends TypedDataFactory<People, PeopleJson> {
     constructor(eventFactory: RR0EventFactory);
     /**
      * Determine people name from directory name.
@@ -8,5 +9,5 @@ export declare class PeopleFactory extends TypedDataFactory<People> {
      * @param dirName
      */
     createFromDirName(dirName: string): People;
-    createFromData(data: RR0Data): People;
+    parse(peopleJson: PeopleJson): People;
 }

package/dist/people/PeopleFactory.js

@@ -22,11 +22,11 @@ export class PeopleFactory extends TypedDataFactory {
         const id = path.basename(dirName);
         return new People(firstNames, lastName, undefined, undefined, undefined, false, undefined, undefined, undefined, id, dirName);
     }
-    createFromData(data) {
-        const people = this.createFromDirName(data.dirName);
-        data.name = people.name;
-        Object.assign(people, super.createFromData(data));
-        let title = data.title;
+    parse(peopleJson) {
+        const people = this.createFromDirName(peopleJson.dirName);
+        peopleJson.name = people.name;
+        Object.assign(people, super.parse(peopleJson));
+        let title = peopleJson.title;
         let qualifier;
         if (title) {
             const qualifStart = title.indexOf("(");
@@ -49,6 +49,7 @@ export class PeopleFactory extends TypedDataFactory {
             }
         }
         people.title = people.firstAndLastName + (qualifier ? ` (${qualifier})` : "");
+        Object.assign(people, { events: peopleJson.events.map(this.eventFactory.parse) });
         return people;
     }
 }

package/dist/people/PeopleJson.d.ts

@@ -0,0 +1,39 @@
+import { Occupation } from "./Occupation.js";
+import { Gender } from "@rr0/common";
+import { CountryCode } from "../org/country/CountryCode.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { RR0DataJson } from "@rr0/data/dist/RR0DataJson";
+import { RR0EventJson } from "@rr0/data/dist/event/RR0EventJson";
+export declare class PeopleJson implements RR0DataJson {
+    readonly type = "people";
+    title: string;
+    name: string;
+    /**
+     * The people actually doesn't exist.
+     */
+    hoax: boolean;
+    lastAndFirstName: string;
+    firstNames: string[];
+    lastName: string;
+    pseudonyms: string[];
+    occupations: Occupation[];
+    countries: CountryCode[];
+    /**
+     * The people has been caught lying or has confessed a hoax.
+     */
+    discredited: boolean;
+    /**
+     * @deprecated Use a "birth"-typed event instead.
+     */
+    birthTime?: EdtfDate;
+    /**
+     * @deprecated Use a "death"-typed event instead.
+     */
+    deathTime?: EdtfDate;
+    gender?: Gender;
+    id: string;
+    dirName?: string;
+    image?: string;
+    url?: string;
+    events: RR0EventJson[];
+}

package/dist/people/PeopleJson.js

@@ -0,0 +1,19 @@
+export class PeopleJson {
+    constructor() {
+        this.type = "people";
+        /**
+         * The people actually doesn't exist.
+         */
+        this.hoax = false;
+        this.firstNames = [];
+        this.lastName = "";
+        this.pseudonyms = [];
+        this.occupations = [];
+        this.countries = [];
+        /**
+         * The people has been caught lying or has confessed a hoax.
+         */
+        this.discredited = false;
+        this.events = [];
+    }
+}

package/dist/people/PeopleService.d.ts

@@ -5,7 +5,8 @@ import { Occupation } from "./Occupation.js";
 import { PeopleFactory } from "./PeopleFactory.js";
 import { AbstractDataService, AllDataService } from "@rr0/data";
 import { TimeService } from "../time";
-export declare class PeopleService extends AbstractDataService<People> {
+import { PeopleJson } from "./PeopleJson";
+export declare class PeopleService extends AbstractDataService<People, PeopleJson> {
     protected peopleFactory: PeopleFactory;
     protected timeService: TimeService;
     readonly cache: Map<string, People>;