@rr0/cms 0.2.5 → 0.3.1

package/dist/org/us/region/ok/OklahomaCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const oklahomaCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const oklahomaCounties: CmsOrganization[];

package/dist/org/us/region/ok/kalamazoo/galesburg/Galesburg.d.ts

@@ -1 +1 @@
-export declare let galesburg: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let galesburg: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/or/OregonCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const oregonCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const oregonCounties: CmsOrganization[];

package/dist/org/us/region/or/kalamazoo/galesburg/Galesburg.d.ts

@@ -1 +1 @@
-export declare let galesburg: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let galesburg: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/pa/westmoreland/Westmoreland.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../../Organization.js";
-export declare const westmoreland: Organization<import("../../../../OrganizationMessages.js").OrganizationMessages>;
+import { CmsOrganization } from "../../../../CmsOrganization.js";
+export declare const westmoreland: CmsOrganization<import("../../../../OrganizationMessages.js").OrganizationMessages>;

package/dist/org/us/region/pa/westmoreland/Westmoreland.js

@@ -1,6 +1,6 @@
 import { UsaCountyCode } from "../../UsaCountyCode.js";
 import { Place } from "@rr0/place";
-import { Organization } from "../../../../Organization.js";
+import { CmsOrganization } from "../../../../CmsOrganization.js";
 import { pennsylvania } from "../Pennsylvania.js";
-import { OrganizationKind } from "../../../../OrganizationKind";
-export const westmoreland = new Organization(UsaCountyCode.westmoreland, [Place.fromDMS("40°19′N 79°28′W")], OrganizationKind.department, pennsylvania);
+import { OrganizationKind } from "@rr0/data";
+export const westmoreland = new CmsOrganization(UsaCountyCode.westmoreland, [Place.fromDMS("40°19′N 79°28′W")], OrganizationKind.department, pennsylvania);

package/dist/org/us/region/pa/westmoreland/monessen/Monessen.d.ts

@@ -1 +1 @@
-export declare let monessen: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let monessen: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/pr/PuertoRicoCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const puertoRicoCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const puertoRicoCounties: CmsOrganization[];

package/dist/org/us/region/pr/kalamazoo/galesburg/Galesburg.d.ts

@@ -1 +1 @@
-export declare let galesburg: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let galesburg: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/sc/SouthCarolinaCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const southCarolinaCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const southCarolinaCounties: CmsOrganization[];

package/dist/org/us/region/sc/kalamazoo/galesburg/Galesburg.d.ts

@@ -1 +1 @@
-export declare let galesburg: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let galesburg: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/tx/TexasCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const texasCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const texasCounties: CmsOrganization[];

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

@@ -2,7 +2,7 @@ import { tarrant_en } from "./tarrant/Tarrant_en.js";
 import { RegionMessages } from "../../../country/index.js";
 import { houstonMessages } from "./houston/HoustonMessages.js";
 import { houstonCityCode } from "./houston/Houston.js";
-import { OrganizationKind } from "../../../OrganizationKind";
+import { OrganizationKind } from "@rr0/data";
 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 "../../../OrganizationKind";
+import { OrganizationKind } from "@rr0/data";
 const texasCityMessages = {
     [houstonCityCode]: houstonMessages
 };

package/dist/org/us/region/tx/houston/Houston.d.ts

@@ -1,2 +1,2 @@
 export declare const houstonCityCode = "48-35000";
-export declare let houston: import("../../../../index.js").City<import("../../../../Organization.js").Organization<import("../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let houston: import("../../../../index.js").City<import("../../../../CmsOrganization.js").CmsOrganization<import("../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/tx/tarrant/fortworth/FortWorth.d.ts

@@ -1 +1 @@
-export declare let fortWorth: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let fortWorth: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/ut/UtahCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const utahCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const utahCounties: CmsOrganization[];

package/dist/org/us/region/ut/uintah/skinwalker/Skinwalker.d.ts

@@ -1 +1 @@
-export declare let skinwalker: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let skinwalker: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

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

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

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

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

package/dist/org/us/region/vi/VirginIslandsCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const virginIslandsCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const virginIslandsCounties: CmsOrganization[];

package/dist/org/us/region/vi/stthomas/CharlotteAmalie/CharlotteAmalie.d.ts

@@ -1 +1 @@
-export declare let charlotteAmalie: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let charlotteAmalie: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/vt/VermontCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const vermontCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const vermontCounties: CmsOrganization[];

package/dist/org/us/region/vt/rutland/Rutland/Rutland.d.ts

@@ -1 +1 @@
-export declare let rutland: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let rutland: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/wa/pierce/bonneylake/BonneyLake.d.ts

@@ -1 +1 @@
-export declare let bonneyLake: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let bonneyLake: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/wi/WisconsinCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const wisconsinCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const wisconsinCounties: CmsOrganization[];

package/dist/org/us/region/wi/dane/Madison/Madison.d.ts

@@ -1 +1 @@
-export declare let madison: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let madison: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/wv/fayette/MountHope/MountHope.d.ts

@@ -1 +1 @@
-export declare let mountHope: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let mountHope: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/wv/mason/PointPleasant/PointPleasant.d.ts

@@ -1 +1 @@
-export declare let pointPleasant: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let pointPleasant: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/org/us/region/wy/WyomingCounties.d.ts

@@ -1,2 +1,2 @@
-import { Organization } from "../../../Organization.js";
-export declare const wyomingCounties: Organization[];
+import { CmsOrganization } from "../../../CmsOrganization.js";
+export declare const wyomingCounties: CmsOrganization[];

package/dist/org/us/region/wy/carbon/Rawlins/Rawlins.d.ts

@@ -1 +1 @@
-export declare let rawlins: import("../../../../../index.js").City<import("../../../../../Organization.js").Organization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;
+export declare let rawlins: import("../../../../../index.js").City<import("../../../../../CmsOrganization.js").CmsOrganization<import("../../../../../OrganizationMessages.js").OrganizationMessages>>;

package/dist/people/OccupationMessages.d.ts

@@ -1,5 +1,5 @@
-import { Occupation } from "./Occupation.js";
 import { Gender } from "@rr0/common";
+import { Occupation } from "@rr0/data";
 export type OccupationMessages = {
     [key in Occupation]: (gender: Gender) => string;
 };

package/dist/people/PeopleDirectoryStep.d.ts

@@ -1,10 +1,7 @@
-import { Occupation } from "./Occupation.js";
-import { People } from "./People.js";
 import { HtmlRR0Context } from "../RR0Context.js";
 import { DirectoryStep, FileWriteConfig, OutputFunc } from "ssg-api";
-import { PeopleService } from "./PeopleService.js";
-import { CountryCode } from "../org/country/CountryCode.js";
 import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
+import { CountryCode, Occupation, People, PeopleService } from "@rr0/data";
 export type PeopleFilter = (p: People) => boolean;
 export declare function peopleOccupationFilter(filterOccupations: Occupation[]): PeopleFilter;
 /**

package/dist/people/PeopleDirectoryStep.js

@@ -1,8 +1,8 @@
-import { People } from "./People.js";
 import { HtmlTag } from "../util/html/HtmlTag.js";
 import { DirectoryStep } from "ssg-api";
 import { StringUtil } from "../util/string/StringUtil.js";
 import { Gender } from "@rr0/common";
+import { People } from "@rr0/data";
 export function peopleOccupationFilter(filterOccupations) {
     return (p) => p.occupations.some(o => filterOccupations.includes(o));
 }

package/dist/people/PeopleDirectoryStepFactory.d.ts

@@ -1,7 +1,7 @@
 import { FileWriteConfig, OutputFunc } from "ssg-api";
-import { PeopleService } from "./PeopleService.js";
 import { PeopleDirectoryStep } from "./PeopleDirectoryStep.js";
 import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
+import { PeopleService } from "@rr0/data";
 export type PeopleDirectoryStepOptions = {
     root: string;
     scientists?: string;

package/dist/people/PeopleDirectoryStepFactory.js

@@ -1,8 +1,8 @@
-import { Occupation } from "./Occupation.js";
 import { RR0FileUtil } from "../util/file/RR0FileUtil.js";
 import { PeopleDirectoryStep, peopleOccupationFilter } from "./PeopleDirectoryStep.js";
 import { glob } from "glob";
 import path from "path";
+import { Occupation } from "@rr0/data";
 /**
  * Scan directories for people information, then populates a template with collected data.
  */

package/dist/people/PeopleFactory.test.js

@@ -1,9 +1,5 @@
 import { describe, expect, test } from "@javarome/testscript";
-import { PeopleFactory } from "./PeopleFactory";
-import { RR0EventFactory } from "@rr0/data";
-import { People } from "./People";
-import { Occupation } from "./Occupation";
-import { CountryCode } from "../org";
+import { CountryCode, Occupation, People, PeopleFactory, RR0EventFactory } from "@rr0/data";
 describe("PeopleFactory", () => {
     const eventFactory = new RR0EventFactory();
     const factory = new PeopleFactory(eventFactory);

package/dist/people/PeopleHtmlRenderer.d.ts

@@ -1,7 +1,5 @@
-import { People } from "./People.js";
 import { HtmlRR0Context } from "../RR0Context.js";
-import { CountryCode } from "../org/index.js";
-import { Occupation } from "./Occupation.js";
+import { CountryCode, Occupation, People } from "@rr0/data";
 export declare class PeopleHtmlRenderer {
     protected defaultPreviewFileNames: string[];
     constructor(defaultPreviewFileNames?: string[]);

package/dist/people/PeopleRegexReplaceCommand.test.js

@@ -1,16 +1,16 @@
-import { PeopleReplacerFactory } from "./PeopleReplacerFactory.js";
-import { rr0TestUtil } from "../test/index.js";
+import path from "path";
 import { ClassDomReplaceCommand } from "ssg-api";
 import { describe, expect, test } from "@javarome/testscript";
-import { PeopleService } from "./PeopleService.js";
-import path from "path";
-import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
+import { PeopleReplacerFactory } from "./PeopleReplacerFactory.js";
+import { rr0TestUtil } from "../test/index.js";
+import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer.js";
+import { PeopleService } from "@rr0/data";
 describe("ClassDomReplaceCommand", () => {
     test("replaces", async () => {
         const peopleRoot = "src/people";
         const peopleFiles = [path.join(peopleRoot, "b/BeauJerome")];
         const peopleRenderer = new PeopleHtmlRenderer();
-        const peopleService = new PeopleService(rr0TestUtil.dataService, rr0TestUtil.peopleFactory, peopleFiles, rr0TestUtil.time.getService());
+        const peopleService = new PeopleService(rr0TestUtil.dataService, rr0TestUtil.peopleFactory, { files: peopleFiles, rootDir: peopleRoot });
         const command = new ClassDomReplaceCommand(new PeopleReplacerFactory(peopleService, peopleRenderer), "people");
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", `<span class="people">Jérôme Beau</span>`);
         await command.execute(context);

package/dist/people/PeopleReplacer.d.ts

@@ -1,7 +1,7 @@
-import { PeopleService } from "./PeopleService.js";
 import { DomReplacement } from "../time/DomReplacement.js";
 import { HtmlRR0Context } from "../RR0Context.js";
 import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
+import { PeopleService } from "@rr0/data";
 export declare class PeopleReplacer implements DomReplacement<HtmlRR0Context> {
     protected service: PeopleService;
     protected renderer: PeopleHtmlRenderer;

package/dist/people/PeopleReplacer.test.js

@@ -1,16 +1,14 @@
 import { PeopleReplacer } from "./PeopleReplacer.js";
-import { rr0TestUtil } from "../test/index.js";
-import { PeopleService } from "./PeopleService.js";
+import { rr0TestUtil, testFilePath } from "../test/index.js";
 import { describe, expect, test } from "@javarome/testscript";
-import { PeopleFactory } from "./PeopleFactory.js";
 import path from "path";
-import { AllDataService, RR0EventFactory } from "@rr0/data";
+import { AllDataService, PeopleFactory, PeopleService, RR0EventFactory } from "@rr0/data";
 import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
 describe("PeopleReplacer", () => {
-    const peopleRoot = "src/people";
-    const peopleFiles = [
-        path.join(peopleRoot, "b/BeauJerome"),
-        path.join(peopleRoot, "h/HynekJosefAllen")
+    const rootDir = testFilePath("people");
+    const files = [
+        path.join(rootDir, "b/BeauJerome"),
+        path.join(rootDir, "h/HynekJosefAllen")
     ];
     const peopleFactory = new PeopleFactory(new RR0EventFactory());
     function createPeopleElement(context, content, title) {
@@ -23,7 +21,7 @@ describe("PeopleReplacer", () => {
     }
     test("ignore brackets", async () => {
         const dataService = new AllDataService([peopleFactory]);
-        const peopleService = new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService());
+        const peopleService = new PeopleService(dataService, peopleFactory, { rootDir, files });
         const peopleRenderer = new PeopleHtmlRenderer();
         const replacer = new PeopleReplacer(peopleService, peopleRenderer);
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
@@ -40,7 +38,7 @@ describe("PeopleReplacer", () => {
     });
     test("replace people tags", async () => {
         const dataService = new AllDataService([peopleFactory]);
-        const peopleService = new PeopleService(dataService, peopleFactory, peopleFiles, rr0TestUtil.time.getService());
+        const peopleService = new PeopleService(dataService, peopleFactory, { rootDir, files });
         const peopleRenderer = new PeopleHtmlRenderer();
         const replacer = new PeopleReplacer(peopleService, peopleRenderer);
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");

package/dist/people/PeopleReplacerFactory.d.ts

@@ -1,8 +1,8 @@
 import { PeopleReplacer } from "./PeopleReplacer.js";
 import { DomReplacer, ReplacerFactory } from "ssg-api";
-import { PeopleService } from "./PeopleService.js";
 import { HtmlRR0Context } from "../RR0Context.js";
 import { PeopleHtmlRenderer } from "./PeopleHtmlRenderer";
+import { PeopleService } from "@rr0/data";
 /**
  * Creates replacers for people HTML in a given context.
  */

package/dist/people/index.d.ts

@@ -1,14 +1,10 @@
 export * from "./author/index.js";
 export * from "./witness/index.js";
-export * from "./Occupation.js";
 export * from "./OccupationMessages.js";
-export * from "./People.js";
 export * from "./PeopleDirectoryStep.js";
 export * from "./PeopleDirectoryStepFactory.js";
-export * from "./PeopleFactory.js";
 export * from "./PeopleMessages.js";
 export * from "./PeopleMessages_en.js";
 export * from "./PeopleMessages_fr.js";
 export * from "./PeopleReplacer.js";
 export * from "./PeopleReplacerFactory.js";
-export * from "./PeopleService.js";

package/dist/people/index.js

@@ -1,14 +1,10 @@
 export * from "./author/index.js";
 export * from "./witness/index.js";
-export * from "./Occupation.js";
 export * from "./OccupationMessages.js";
-export * from "./People.js";
 export * from "./PeopleDirectoryStep.js";
 export * from "./PeopleDirectoryStepFactory.js";
-export * from "./PeopleFactory.js";
 export * from "./PeopleMessages.js";
 export * from "./PeopleMessages_en.js";
 export * from "./PeopleMessages_fr.js";
 export * from "./PeopleReplacer.js";
 export * from "./PeopleReplacerFactory.js";
-export * from "./PeopleService.js";

package/dist/place/OrganizationPlace.d.ts

@@ -1,6 +1,6 @@
-import { Organization } from "../org";
+import { CmsOrganization } from "../org";
 import { Place } from "@rr0/place";
 export declare class OrganizationPlace extends Place {
-    readonly org: Organization;
-    constructor(org: Organization);
+    readonly org: CmsOrganization;
+    constructor(org: CmsOrganization);
 }

package/dist/place/PlaceReplacer.test.js

@@ -4,7 +4,7 @@ import { rr0TestUtil } from "../test/index.js";
 import { describe, expect, test } from "@javarome/testscript";
 import { OrganizationMessages } from "../org/index.js";
 import { Place, PlaceLocation, PlaceService } from "@rr0/place";
-import { OrganizationKind } from "../org/OrganizationKind";
+import { OrganizationKind } from "@rr0/data";
 class MockPlaceService extends PlaceService {
     constructor(location, elevation, dirName) {
         super("place");

package/dist/test/RR0TestUtil.d.ts

@@ -1,10 +1,10 @@
 import { HtmlRR0Context, RR0Context } from "../RR0Context.js";
 import { FileWriteConfig } from "ssg-api";
-import { CityService, CountryService, DepartmentService, OrganizationFactory, OrganizationService, RegionService } from "../org/index.js";
+import { CityService, DepartmentService, OrganizationFactory, OrganizationService, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
-import { PeopleFactory } from "../people/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
-import { AllDataService } from "@rr0/data";
+import { AllDataService, PeopleFactory } from "@rr0/data";
+import { CountryService } from "../org/country/CountryService";
 export declare class RR0TestUtil {
     readonly rootDir: string;
     readonly outDir: string;

package/dist/test/RR0TestUtil.js

@@ -1,14 +1,14 @@
 import path from "path";
 import { RR0ContextImpl } from "../RR0Context.js";
 import { HtmlFileContents } from "ssg-api";
-import { cities, CityService, countries, CountryService, departments, DepartmentService, OrganizationFactory, OrganizationService, regions, RegionService } from "../org/index.js";
+import { cities, CityService, countries, departments, DepartmentService, OrganizationFactory, OrganizationService, regions, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
-import { PeopleFactory } from "../people/index.js";
 import { APIFactory } from "../tech/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
 import { TimeContext } from "@rr0/time";
 import { FileContents } from "@javarome/fileutil";
-import { AllDataService, EventDataFactory, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { AllDataService, EventDataFactory, PeopleFactory, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { CountryService } from "../org/country/CountryService";
 export class RR0TestUtil {
     constructor(rootDir = "test", outDir = "out") {
         this.rootDir = rootDir;

package/dist/time/datasource/nuforc/NuforcRR0Mapper.d.ts

@@ -5,7 +5,7 @@ import { NuforcCountry } from "./NuforcCountry.js";
 import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
 import { NuforcShape } from "./NuforcShape.js";
 import { CityService } from "../../../org/country/index.js";
-import { CountryService } from "../../../org/country/CountryService.js";
+import { CountryService } from "../../../org/country/CountryService";
 export declare class NuforcRR0Mapper implements CaseMapper<HtmlRR0Context, NuforcCaseSummary, RR0CaseSummary> {
     protected cityService: CityService;
     protected countryService: CountryService;

package/dist/time/datasource/nuforc/NuforcRR0Mapping.d.ts

@@ -1,9 +1,10 @@
 import { NuforcRR0Mapper } from "./NuforcRR0Mapper.js";
 import { NuforcHttpDatasource } from "./NuforcHttpDatasource.js";
-import { CityService, CountryService } from "../../../org";
+import { CityService } from "../../../org";
 import { RR0CaseMapping } from "../rr0";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
 import { NuforcCaseSummary } from "./NuforcCaseSummary";
+import { CountryService } from "../../../org/country/CountryService";
 export declare const nuforcDatasource: NuforcHttpDatasource;
 export declare class NuforcRR0Mapping implements RR0CaseMapping<NuforcCaseSummary> {
     readonly actions: ChronologyReplacerActions;

package/dist/time/datasource/urecat/UrecatRR0Mapper.d.ts

@@ -3,7 +3,7 @@ import { UrecatCase } from "./UrecatCase.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
 import { CityService } from "../../../org/country/index.js";
-import { CountryService } from "../../../org/country/CountryService.js";
+import { CountryService } from "../../../org/country/CountryService";
 export declare class UrecatRR0Mapper implements CaseMapper<HtmlRR0Context, UrecatCase, RR0CaseSummary> {
     protected cityService: CityService;
     protected countryService: CountryService;

package/dist/time/datasource/urecat/UrecatRR0Mapping.d.ts

@@ -3,7 +3,8 @@ import { UrecatHttpDatasource } from "./UrecatHttpDatasource.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { RR0CaseMapping } from "../rr0";
 import { UrecatCase } from "./UrecatCase";
-import { CityService, CountryService } from "../../../org";
+import { CityService } from "../../../org";
+import { CountryService } from "../../../org/country/CountryService";
 export declare const urecatDatasource: UrecatHttpDatasource;
 export declare class UrecatRR0Mapping implements RR0CaseMapping<UrecatCase> {
     readonly actions: ChronologyReplacerActions;

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.5",
+  "version": "0.3.1",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -28,26 +28,26 @@
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
+    "@javarome/fileutil": "^0.3.6",
     "@rr0/common": "^1.1.3",
+    "@rr0/data": "^0.3.1",
     "@rr0/lang": "^0.1.12",
-    "@rr0/time": "^0.9.2",
     "@rr0/place": "^0.5.1",
-    "@rr0/data": "^0.2.3",
-    "@javarome/fileutil": "^0.3.6",
-    "ssg-api": "^1.16.12",
+    "@rr0/time": "^0.9.2",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",
     "glob": "^11.0.0",
     "image-size": "^1.1.1",
     "jsdom": "^24.1.0",
-    "selenium-webdriver": "^4.22.0"
+    "selenium-webdriver": "^4.22.0",
+    "ssg-api": "^1.16.12"
   },
   "devDependencies": {
+    "@javarome/testscript": "^0.13.1",
     "@types/jsdom": "^21.1.7",
-    "typescript": "^5.6.3",
     "@types/node": "^22.7.4",
     "tsx": "4.17.0",
-    "@javarome/testscript": "^0.13.1",
+    "typescript": "^5.6.3",
     "vite": "^6.1.0"
   },
   "keywords": [

package/dist/org/OrganizationKind.d.ts

@@ -1,7 +0,0 @@
-export declare enum OrganizationKind {
-    country = "country",
-    region = "region",
-    department = "department",
-    city = "city",
-    company = "company"
-}

package/dist/org/OrganizationKind.js

@@ -1,8 +0,0 @@
-export var OrganizationKind;
-(function (OrganizationKind) {
-    OrganizationKind["country"] = "country";
-    OrganizationKind["region"] = "region";
-    OrganizationKind["department"] = "department";
-    OrganizationKind["city"] = "city";
-    OrganizationKind["company"] = "company";
-})(OrganizationKind || (OrganizationKind = {}));

package/dist/org/country/Country.d.ts

@@ -1,6 +0,0 @@
-import { CountryCode } from "./CountryCode.js";
-import { Place } from "@rr0/place";
-import { Organization } from "../Organization.js";
-export declare class Country extends Organization {
-    constructor(code: CountryCode, places?: Place[]);
-}

package/dist/org/country/Country.js

@@ -1,7 +0,0 @@
-import { Organization } from "../Organization.js";
-import { OrganizationKind } from "../OrganizationKind";
-export class Country extends Organization {
-    constructor(code, places = []) {
-        super(code, places, OrganizationKind.country);
-    }
-}