@rr0/cms 0.2.0 → 0.2.2

package/dist/org/br/region/cw/CentralWest.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+import { Place, PlaceLocation } from "@rr0/place";
 import { brazilRegion } from "../../Brazil.js";
 import { BrazilRegionCode } from "../BrazilRegionCode.js";
-import { PlaceLocation } from "@rr0/place";
 export const centralWest = brazilRegion(BrazilRegionCode.cw, new Place([PlaceLocation.fromDMS("14°47′S,53°31′O")]));

package/dist/org/br/region/se/SouthEast.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+import { Place, PlaceLocation } from "@rr0/place";
 import { brazilRegion } from "../../Brazil.js";
 import { BrazilRegionCode } from "../BrazilRegionCode.js";
-import { PlaceLocation } from "@rr0/place";
 export const southEast = brazilRegion(BrazilRegionCode.se, new Place([PlaceLocation.fromDMS("14°47′S,53°31′O")]));

package/dist/org/us/region/fl/Florida.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+import { Place, PlaceLocation } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
-import { PlaceLocation } from "@rr0/place";
 export const florida = usaRegion(UsaStates.fl, new Place([PlaceLocation.fromDMS("24°27'N,80° 02' W"), PlaceLocation.fromDMS("31° 00' N,87° 38' W")]));

package/dist/org/us/region/hi/Hawaii.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+import { Place, PlaceLocation } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
-import { PlaceLocation } from "@rr0/place";
 export const hawaii = usaRegion(UsaStates.hi, new Place([PlaceLocation.fromDMS("21°28′00″N,157°58′00″W")]));

package/dist/org/us/region/in/Indiana.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+import { Place, PlaceLocation } from "@rr0/place";
 import { UsaStates } from "../UsaStates.js";
 import { usaRegion } from "../../Usa.js";
-import { PlaceLocation } from "@rr0/place";
 export const indiana = usaRegion(UsaStates.in, new Place([PlaceLocation.fromDMS("39°09′44″N,86°31′45″O")]));

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

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+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/wa/Washington.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+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/wv/WestVirginia.js

@@ -1,5 +1,4 @@
-import { Place } from "@rr0/place";
+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/people/PeopleFactory.d.ts

@@ -9,5 +9,5 @@ export declare class PeopleFactory extends TypedDataFactory<People, PeopleJson>
      * @param dirName
      */
     createFromDirName(dirName: string): People;
-    createFromData(peopleJson: PeopleJson): People;
+    parse(peopleJson: PeopleJson): People;
 }

package/dist/people/PeopleFactory.js

@@ -22,7 +22,7 @@ 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(peopleJson) {
+    parse(peopleJson) {
         const people = this.createFromDirName(peopleJson.dirName);
         peopleJson.name = people.name;
         Object.assign(people, super.parse(peopleJson));
@@ -49,17 +49,7 @@ export class PeopleFactory extends TypedDataFactory {
             }
         }
         people.title = people.firstAndLastName + (qualifier ? ` (${qualifier})` : "");
-        const birthTime = peopleJson.birthTime;
-        const events = peopleJson.events || [];
-        if (birthTime) {
-            delete peopleJson.birthTime;
-            events.push({ type: "event", eventType: "birth", time: birthTime, events: [] });
-        }
-        const deathTime = peopleJson.deathTime;
-        if (deathTime) {
-            delete peopleJson.deathTime;
-            events.push({ type: "event", eventType: "death", time: deathTime, events: [] });
-        }
+        Object.assign(people, { events: peopleJson.events.map(this.eventFactory.parse) });
         return people;
     }
 }

package/dist/people/PeopleJson.d.ts

@@ -23,9 +23,12 @@ export declare class PeopleJson implements RR0DataJson {
      */
     discredited: boolean;
     /**
-     * @deprecated Use a "birth"-typed sub-data instead.
+     * @deprecated Use a "birth"-typed event instead.
      */
     birthTime?: EdtfDate;
+    /**
+     * @deprecated Use a "death"-typed event instead.
+     */
     deathTime?: EdtfDate;
     gender?: Gender;
     id: string;

package/dist/place/PlaceService.test.js

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { PlaceLocation, GooglePlaceService } from "@rr0/place";
+import { GooglePlaceService, PlaceLocation } from "@rr0/place";
 describe("PlaceService", () => {
     const apiKey = process.env.GOOGLE_MAPS_API_KEY;
     if (!apiKey) {

package/dist/tech/info/soft/APIFactory.d.ts

@@ -1,7 +1,7 @@
 import { API } from "./API.js";
-import { RR0Data, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { APIJson } from "./APIJson";
 export declare class APIFactory extends TypedDataFactory<API, APIJson> {
     constructor(eventFactory: RR0EventFactory);
-    createFromData(data: RR0Data): API;
+    parse(apiJson: APIJson): API;
 }

package/dist/tech/info/soft/APIFactory.js

@@ -3,9 +3,8 @@ export class APIFactory extends TypedDataFactory {
     constructor(eventFactory) {
         super(eventFactory, "api", ["index"]);
     }
-    createFromData(data) {
-        const api = { type: "api", id: data.id, dirName: data.dirName, url: data.url, events: data.events || [] };
-        Object.assign(api, data);
-        return api;
+    parse(apiJson) {
+        const events = apiJson.events.map(this.eventFactory.parse);
+        return { type: "api", id: apiJson.id, dirName: apiJson.dirName, url: apiJson.url, events };
     }
 }

package/dist/time/TimeUrlBuilder.d.ts

@@ -1,5 +1,4 @@
-import { TimeContext } from "@rr0/time";
-import { Level2Date as EdtfDate } from "@rr0/time";
+import { Level2Date as EdtfDate, TimeContext } from "@rr0/time";
 export type TimeUrlBuilderOptions = {
     rootDir: string;
 };

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

@@ -2,8 +2,8 @@ import { HttpSource } from "../HttpSource.js";
 import { UrlUtil } from "../../../util/index.js";
 import { RR0Datasource } from "./RR0Datasource.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
+import { NamedPlace } from "@rr0/place";
 import { OrganizationPlace } from "../../../place/OrganizationPlace";
-import { NamedPlace } from "../../../place/NamedPlace";
 export class RR0HttpDatasource extends RR0Datasource {
     constructor(baseUrl, searchPath, cityService) {
         super();
@@ -55,7 +55,17 @@ export class RR0HttpDatasource extends RR0Datasource {
         const sources = this.getSources(row, itemContext);
         const description = this.getDescription(row);
         const id = RR0HttpDatasource.id(itemTime.date, place);
-        return { type: "event", eventType: "sighting", events: [], url: url.href, place, time: itemTime.date, description, sources, id };
+        return {
+            type: "event",
+            eventType: "sighting",
+            events: [],
+            url: url.href,
+            place,
+            time: itemTime.date,
+            description,
+            sources,
+            id
+        };
     }
     async readCases(context) {
         const queryUrl = this.queryUrl(context);
@@ -77,7 +87,13 @@ export class RR0HttpDatasource extends RR0Datasource {
             const pubItems = title.split(",");
             const timeStr = pubItems[pubItems.length - 1].trim();
             let publisher;
-            const time = EdtfDate.fromString(timeStr);
+            let time;
+            try {
+                time = EdtfDate.fromString(timeStr);
+            }
+            catch (e) {
+                console.warn("Could not parse source time", e);
+            }
             if (time) {
                 pubItems.pop();
             }

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

@@ -7,10 +7,10 @@ import { CityService } from "../../../org";
 import { RR0Datasource } from "./RR0Datasource";
 export declare class RR0Mapping implements RR0CaseMapping<RR0CaseSummary> {
     readonly actions: ChronologyReplacerActions;
+    static baseUrl: URL;
+    static searchPath: string;
     readonly datasource: RR0Datasource;
     readonly fileDatasource: RR0FileDatasource;
     readonly mapper: RR0CaseSummaryMapper;
-    static baseUrl: URL;
-    static searchPath: string;
     constructor(cityService: CityService, actions: ChronologyReplacerActions);
 }

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

@@ -2,7 +2,7 @@ import { Level2Date as EdtfDate } from "@rr0/time";
 import { UrlUtil } from "../../../util/index.js";
 import { RR0HttpDatasource } from "./RR0HttpDatasource";
 import { RR0Mapping } from "./RR0Mapping";
-import { NamedPlace } from "../../../place/NamedPlace";
+import { NamedPlace } from "@rr0/place";
 function testCase(urlPath, time, description, sources, place) {
     const path = UrlUtil.join(RR0Mapping.searchPath, urlPath);
     const url = new URL(path, RR0Mapping.baseUrl).href;

package/dist/time/datasource/sceau/SceauCaseSummaryRR0Mapper.js

@@ -16,7 +16,16 @@ export class SceauCaseSummaryRR0Mapper {
         const source = {
             previousSourceRefs: [], events: [],
             url: sourceCase.url, title: "cas n° " + id, authors: this.authors,
-            publication: { publisher: this.copyright, time: new EdtfDate({ year: sourceTime.getFullYear(), month: sourceTime.getMonth(), day: sourceTime.getDate(), hour: sourceTime.getHours(), minute: sourceTime.getSeconds() }) }
+            publication: {
+                publisher: this.copyright,
+                time: new EdtfDate({
+                    year: sourceTime.getFullYear(),
+                    month: sourceTime.getMonth(),
+                    day: sourceTime.getDate(),
+                    hour: sourceTime.getHours(),
+                    minute: sourceTime.getSeconds()
+                })
+            }
         };
         const cityName = sourceCase.ville;
         const city = this.cityService.find(context, cityName, undefined);

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.2.0",
+  "version": "0.2.2",
   "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/CsvMapper.test.ts",
+    "test-one": "rm -Rf out && tsx src/RR0Build.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
     "@rr0/common": "^1.1.3",
     "@rr0/lang": "^0.1.12",
     "@rr0/time": "^0.9.1",
-    "@rr0/place": "^0.5.0",
-    "@rr0/data": "^0.2.0",
+    "@rr0/place": "^0.5.1",
+    "@rr0/data": "^0.2.1",
     "@javarome/fileutil": "^0.3.6",
     "ssg-api": "^1.16.12",
     "canvas": "^2.11.2",

package/dist/place/NamedPlace.d.ts

@@ -1,5 +0,0 @@
-import { Place } from "@rr0/place";
-export declare class NamedPlace extends Place {
-    readonly name: string;
-    constructor(name: string);
-}

package/dist/place/NamedPlace.js

@@ -1,7 +0,0 @@
-import { Place } from "@rr0/place";
-export class NamedPlace extends Place {
-    constructor(name) {
-        super([]);
-        this.name = name;
-    }
-}