@rr0/cms 0.1.23 → 0.2.0

package/dist/DefaultContentVisitor.d.ts

@@ -10,12 +10,12 @@ export declare class DefaultContentVisitor implements ContentVisitor {
     constructor(service: AllDataService, eventRenderer: EventRenderer<RR0Event>, timeElementFactory: TimeElementFactory);
     visit(context: HtmlRR0Context): Promise<void>;
     protected process(context: HtmlRR0Context, data: RR0Data): Promise<void>;
-    protected timeParagraph(context: HtmlRR0Context, event: RR0Data): {
+    protected timeParagraph(context: HtmlRR0Context, event: RR0Event): {
         eventP: HTMLParagraphElement;
         timeEl: HTMLElement;
     };
     protected processImage(context: HtmlRR0Context, imageData: RR0Data): Promise<void>;
-    protected processBirth(context: HtmlRR0Context, event: RR0Data, entity: RR0Data): Promise<void>;
+    protected processBirth(context: HtmlRR0Context, event: RR0Event, entity: RR0Data): Promise<void>;
     protected processDeath(context: HtmlRR0Context, event: RR0Event, entity: RR0Data): Promise<void>;
     protected processBook(context: HtmlRR0Context, bookData: RR0Data): Promise<void>;
     protected processTitle(context: HtmlRR0Context, data: RR0Data): void;

package/dist/DefaultContentVisitor.js

@@ -26,7 +26,7 @@ export class DefaultContentVisitor {
         const events = data.events.sort((event1, event2) => event1.time ? event2.time ? event1.time.isBefore(event2.time) ? -1 : 1 : -1 : 1);
         const doc = context.file.document;
         for (const event of events) {
-            switch (event.type) {
+            switch (event.eventType) {
                 case "birth":
                     await this.processBirth(context, event, data);
                     break;
@@ -50,7 +50,7 @@ export class DefaultContentVisitor {
     timeParagraph(context, event) {
         const container = context.file.document.createElement("p");
         const eventContext = context.clone();
-        const eventTime = eventContext.time = event.time;
+        const eventTime = eventContext.time.date = event.time;
         assert.ok(eventTime, `Event of type "${event.type}" has no time`);
         container.dataset.time = eventTime.toString();
         const timeEl = this.timeElementFactory.create(eventContext, context);
@@ -88,9 +88,10 @@ export class DefaultContentVisitor {
             eventP.append(name);
             eventP.append(context.messages[entity.type].birth);
             eventP.append(timeEl);
-            if (event.place) {
+            const eventPlace = event.place;
+            if (eventPlace) {
                 eventP.append(" à ");
-                eventP.append(this.eventRenderer.placeElement(context, event.place));
+                eventP.append(this.eventRenderer.placeElement(context, eventPlace));
             }
             await this.eventRenderer.renderEnd(context, event, eventP);
             const insertEl = parentEl.firstElementChild;

package/dist/RR0Build.d.ts

@@ -56,6 +56,9 @@ export declare class RR0Build {
     private dataService;
     private peopleFactory;
     private timeTextBuilder;
+    private cityService;
+    private departmentService;
+    private countryService;
     constructor(options: RR0BuildOptions);
     run(args: RR0BuildArgs): Promise<void>;
 }

package/dist/RR0Build.js

@@ -1,12 +1,12 @@
 import path from "path";
 import fs from "fs";
-import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, RR0Mapping, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
+import { BaseOvniFranceRR0Mapping, CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, FuforaRR0Mapping, HttpSource, NuforcRR0Mapping, RR0Mapping, SceauRR0Mapping, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder, UrecatRR0Mapping } from "./time";
 import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/index.js";
-import { GooglePlaceService, PlaceReplacerFactory } from "./place/index.js";
-import { OrganizationFactory, OrganizationService } from "./org/index.js";
+import { PlaceReplacerFactory } from "./place/index.js";
+import { cities, CityService, countries, CountryService, departments, DepartmentService, OrganizationFactory, OrganizationService, regions, RegionService } from "./org/index.js";
 import { RR0ContextImpl } from "./RR0Context.js";
 import { HtmlTable } from "./util/index.js";
-import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
+import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
 import { LanguageReplaceCommand } from "./lang/index.js";
 import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleFactory, PeopleReplacerFactory, PeopleService, WitnessReplacerFactory } from "./people";
 import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source";
@@ -28,10 +28,14 @@ import { DefaultContentVisitor } from "./DefaultContentVisitor.js";
 import { rr0DefaultCopyright } from "./RR0DefaultCopyright.js";
 import { TimeContext } from "@rr0/time";
 import { writeFile } from "@javarome/fileutil";
-import { AllDataService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { AllDataService, EventDataFactory, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { GooglePlaceService } from "@rr0/place";
+import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping";
 const outputFunc = async (context, outFile) => {
     try {
-        context.file.contents = context.file.serialize();
+        if (context.file instanceof HtmlFileContents) {
+            context.file.contents = context.file.serialize();
+        }
         context.log("Writing", outFile.name);
         await outFile.write();
         context.file.contents = outFile.contents;
@@ -52,15 +56,19 @@ export class RR0Build {
         const context = this.context = new RR0ContextImpl(options.locale, timeContext, this.config);
         context.setVar("mapsApiKey", options.googleMapsApiKey);
         context.setVar("mail", options.mail);
+        const eventFactory = new RR0EventFactory();
         this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
-        this.orgService = new OrganizationService([], "org", undefined);
+        const orgFactory = new OrganizationFactory(eventFactory);
+        this.orgService = new OrganizationService([], "org", orgFactory, undefined);
+        const countryService = this.countryService = new CountryService(countries, "org", orgFactory, undefined);
+        const regionService = new RegionService(regions, "org", orgFactory, countryService);
+        const departmentService = this.departmentService = new DepartmentService(departments, "org", orgFactory, regionService);
+        this.cityService = new CityService(cities, "org", orgFactory, departmentService);
         const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
         const timeOptions = options.timeOptions;
         const timeRoot = timeOptions.root;
         const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeRoot });
-        const eventFactory = new RR0EventFactory();
-        const sightingFactory = new TypedDataFactory(eventFactory, "sighting", ["index"]);
-        const orgFactory = new OrganizationFactory(eventFactory);
+        const sightingFactory = new EventDataFactory(eventFactory, "sighting", ["index"]);
         const caseFactory = this.caseFactory = new CaseFactory(eventFactory);
         const peopleFactory = this.peopleFactory = new PeopleFactory(eventFactory);
         const apiFactory = new APIFactory(eventFactory);
@@ -123,9 +131,17 @@ export class RR0Build {
         // const actions: ChronologyReplacerActions = {read: ["backup", "fetch"], write: ["backup", "pages"]}
         // const actions: ChronologyReplacerActions = {read: [], write: ["backup"]}
         const actions = { read: ["fetch"], write: ["backup"] };
-        const rr0Mapping = new RR0Mapping(actions);
-        const databaseAggregationCommand = new DomReplaceCommand(".contents ul", new ChronologyReplacerFactory(timeService, [rr0Mapping /*new GeipanRR0Mapping(actions)
-          /*, baseOvniFranceRR0Mapping, fuforaRR0Mapping, nuforcRR0Mapping, urecatRR0Mapping*/
+        const rr0Mapping = new RR0Mapping(this.cityService, actions);
+        const geipanRR0Mapping = new GeipanRR0Mapping(this.cityService, actions);
+        const baseOvniFranceRR0Mapping = new BaseOvniFranceRR0Mapping(this.cityService, this.departmentService, actions);
+        const fuforaRR0Mapping = new FuforaRR0Mapping(this.cityService, actions);
+        const nuforcRR0Mapping = new NuforcRR0Mapping(this.cityService, this.countryService, actions);
+        const urecatRR0Mapping = new UrecatRR0Mapping(this.cityService, this.countryService, actions);
+        const sceauRR0Mapping = new SceauRR0Mapping(this.cityService, actions);
+        const databaseAggregationCommand = new DomReplaceCommand(".contents ul", new ChronologyReplacerFactory(timeService, [rr0Mapping,
+            geipanRR0Mapping,
+            baseOvniFranceRR0Mapping, fuforaRR0Mapping, nuforcRR0Mapping, urecatRR0Mapping,
+            sceauRR0Mapping
         ], caseRenderer));
         const timeDefaultHandler = (context) => {
             let title;

package/dist/RR0Build.test.js

@@ -1,17 +1,13 @@
 import { glob } from "glob";
 import { describe } from "@javarome/testscript";
-import { FileContents } from "@javarome/fileutil";
-import { CLI } from "./util/index.js";
 import { RR0Build } from "./RR0Build.js";
 import { testFilePath } from "./test";
 import * as process from "node:process";
 describe("Build", () => {
     console.time("ssg");
-    let args = new CLI().getArgs();
-    const configFile = args.config;
-    if (configFile) {
-        args = JSON.parse(FileContents.read(configFile).contents);
-    }
+    const args = {
+        force: "true"
+    };
     const cliContents = args.contents;
     console.debug("contents", cliContents);
     const mandatoryRoots = ["people/*.html", "science/crypto/ufo/enquete/dossier/*.html"];

package/dist/RR0Context.d.ts

@@ -3,6 +3,7 @@ import { FileWriteConfig, HtmlSsgContext, SsgContext, SsgContextImpl } from "ssg
 import { People } from "./people/People.js";
 import { TimeContext } from "@rr0/time";
 import { FileContents } from "@javarome/fileutil";
+import { PlaceContext } from "@rr0/place";
 export interface RR0Context extends SsgContext {
     readonly messages: RR0Messages;
     readonly time: TimeContext;
@@ -11,6 +12,7 @@ export interface RR0Context extends SsgContext {
 export interface HtmlRR0Context extends HtmlSsgContext {
     readonly messages: RR0Messages;
     time: TimeContext;
+    place: PlaceContext;
     people: People;
     readonly images: Set<string>;
     readonly config: FileWriteConfig;
@@ -23,6 +25,7 @@ export declare class RR0ContextImpl extends SsgContextImpl {
     readonly messages: RR0Messages;
     readonly images: Set<string>;
     protected readonly fileMap: Map<string, FileContents>;
+    place: PlaceContext;
     constructor(locale: string, time: TimeContext, config: FileWriteConfig, people?: any, currentFile?: FileContents | undefined, messages?: RR0Messages);
     read(filePath: string): FileContents;
     clone(locale?: string): RR0ContextImpl;

package/dist/RR0Context.js

@@ -1,5 +1,6 @@
 import { ssgMessages } from "./lang/index.js";
 import { ConsoleLogger, SsgContextImpl } from "ssg-api";
+import { PlaceContext } from "@rr0/place";
 export class RR0ContextImpl extends SsgContextImpl {
     constructor(locale, time, config, people = undefined, currentFile = undefined, messages = ssgMessages[locale]) {
         super(locale, new Map(), "RR0", new ConsoleLogger("RR0"), currentFile);
@@ -9,6 +10,16 @@ export class RR0ContextImpl extends SsgContextImpl {
         this.messages = messages;
         this.images = new Set();
         this.fileMap = new Map();
+        while (!this.messages) {
+            if (locale.length > 2) {
+                locale = locale.substring(0, 2); // Fallback to language without country specifics
+            }
+            else {
+                locale = "fr"; // Default language
+            }
+            this.messages = ssgMessages[locale];
+        }
+        this.place = new PlaceContext(locale, this.messages.context.place);
     }
     read(filePath) {
         let file = this.fileMap.get(filePath);

package/dist/RR0Context.test.js

@@ -0,0 +1,23 @@
+import { describe, expect, test } from "@javarome/testscript";
+import { rr0TestUtil } from "./test";
+import { ssgMessages } from "./lang";
+describe("RROContextImpl", () => {
+    describe("constructor with locale", () => {
+        test("default locale", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "");
+            expect(context.locale).toBe("fr");
+        });
+        test("supported locale", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "", "en");
+            expect(context.locale).toBe("en");
+        });
+        test("locale fallback to lang only", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "", "en-US");
+            expect(context.messages).toEqual(ssgMessages["en"]);
+        });
+        test("locale fallback to default", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "", "xx");
+            expect(context.messages).toEqual(ssgMessages["fr"]);
+        });
+    });
+});

package/dist/anchor/CaseAnchorHandler.js

@@ -6,6 +6,7 @@ export class CaseAnchorHandler {
         this.timeTextBuilder = timeTextBuilder;
     }
     async handle(context, link, pathToSearch) {
+        var _a, _b, _c, _d, _e, _f;
         if (!link.title) {
             const foundCases = await this.caseService.get(pathToSearch);
             const aCase = foundCases[0];
@@ -23,13 +24,15 @@ export class CaseAnchorHandler {
                     const classificationLabels = context.messages.case.classification.hynek[hynek];
                     titles.push(classificationLabels.long);
                 }
-                const timeStr = aCase.time;
-                if (timeStr) {
-                    if (timeStr instanceof TimeContext) {
-                        caseContext.time = timeStr;
+                const caseTime = aCase.time;
+                if (caseTime) {
+                    if (typeof caseTime === "string") {
+                        if (!titles.includes(caseTime)) {
+                            caseContext.time.updateFromStr(caseTime);
+                        }
                     }
-                    else if (!titles.includes(timeStr)) {
-                        caseContext.time.updateFromStr(timeStr);
+                    else {
+                        caseContext.time = new TimeContext((_a = caseTime.year) === null || _a === void 0 ? void 0 : _a.value, (_b = caseTime.month) === null || _b === void 0 ? void 0 : _b.value, (_c = caseTime.day) === null || _c === void 0 ? void 0 : _c.value, (_d = caseTime.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = caseTime.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = caseTime.timeshift) === null || _f === void 0 ? void 0 : _f.toString());
                     }
                     titles.push(this.timeTextBuilder.build(caseContext));
                 }

package/dist/anchor/DataAnchorHandler.js

@@ -48,11 +48,13 @@ export class DataAnchorHandler {
         }
         if (next) {
             linkEl.classList.add("deprecated");
-            let note = data.note;
-            if (!note) {
-                note = `Remplacé par ${next}`;
+            let notes = data.notes;
+            if ((notes === null || notes === void 0 ? void 0 : notes.length) <= 0) {
+                notes = [`Remplacé par ${next}`];
+            }
+            for (const note of notes) {
+                this.handleNote(context, linkEl, note);
             }
-            this.handleNote(context, linkEl, note);
         }
     }
     handleProduct(context, data, linkEl) {

package/dist/book/BookDirectoryStep.js

@@ -79,7 +79,7 @@ export class BookDirectoryStep extends DirectoryStep {
         const authorStr = authors ? authors.join(" & ") + ": " : "";
         const time = dirBook.publication.time;
         if (time) {
-            const timeDetail = time.getYear();
+            const timeDetail = time.year.value;
             details.push(HtmlTag.toString("time", timeDetail.toString()));
         }
         const text = [authorStr, dirBook.title];

package/dist/book/BookJson.d.ts

@@ -0,0 +1,9 @@
+import { Chapter } from "./Chapters.js";
+import { SourceJson } from "@rr0/data/dist/source";
+export interface BookJson extends SourceJson {
+    type: "book";
+    /**
+     * Variants roots (language-specific, typically)
+     */
+    variants: Chapter[];
+}

package/dist/book/BookJson.js

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

package/dist/book/BookService.js

@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import * as path from "path";
 import { StringUtil } from "../util/string/StringUtil.js";
 import { CSVFileReader } from "../CSVFileReader.js";
@@ -42,7 +42,7 @@ export class BookService {
             const title = result[COLUMN_TITLE];
             if (timeStr) {
                 const year = parseInt(timeStr, 10);
-                const time = new TimeContext(year);
+                const time = new EdtfDate({ year });
                 const author = result[COLUMN_AUTHOR];
                 const summary = result[COLUMN_SUMMARY];
                 const authorLastFirst = result[COLUMN_AUTHOR_LAST_FIRST];
@@ -67,7 +67,7 @@ export class BookService {
                         authorsStr = authorsStr.substring(0, authorsStr.length - andAl.length - 1) + andAl;
                     }
                 } while (dirName.length >= 255);
-                const parentDir = this.timeUrlBuilder.fromContext(time);
+                const parentDir = this.timeUrlBuilder.fromEdtf(time);
                 const bookDir = path.join(parentDir, dirName);
                 const id = result[COLUMN_ISBN];
                 const book = {

package/dist/lang/RR0Messages.d.ts

@@ -50,6 +50,8 @@ export type CaseMessages = {
     classification: CaseClassificationMessages;
     conclusion: CaseConclusionMessages;
 };
+export interface RR0PlaceMessages extends PlaceMessages {
+}
 export interface RR0Messages {
     nonSignificantWords: string[];
     context: {
@@ -86,6 +88,7 @@ export interface RR0Messages {
             in(approximate: boolean): string;
             starting(approximate: boolean): string;
         };
+        place: RR0PlaceMessages;
     };
     case: CaseMessages;
     org: OrgRR0Messages;

package/dist/lang/RR0Messages_en.d.ts

@@ -35,6 +35,7 @@ export declare class RR0Messages_en implements RR0Messages {
             fromTo: (startReplacement: string, endReplacement: string) => string;
             starting: (approximate: boolean) => string;
         };
+        place: import("@rr0/place").PlaceMessages;
     };
     case: {
         classification: CaseClassificationMessages;

package/dist/lang/RR0Messages_en.js

@@ -80,7 +80,8 @@ export class RR0Messages_en {
                 in: (approximate) => (approximate ? "around " : ""),
                 fromTo: (startReplacement, endReplacement) => startReplacement + " to " + endReplacement,
                 starting: (approximate) => "starting " + (approximate ? "" : "the ")
-            }
+            },
+            place: placeMessages_en
         };
         this.case = {
             classification: caseClassification_en,

package/dist/lang/RR0Messages_fr.d.ts

@@ -35,6 +35,7 @@ export declare class RR0Messages_fr implements RR0Messages {
             fromTo: (startReplacement: string, endReplacement: string) => string;
             starting: (approximate: boolean) => string;
         };
+        place: import("@rr0/place").PlaceMessages;
     };
     case: {
         classification: {

package/dist/lang/RR0Messages_fr.js

@@ -51,7 +51,8 @@ export class RR0Messages_fr {
                 in: (approximate) => (approximate ? "vers " : "en "),
                 fromTo: (startReplacement, endReplacement) => `${startReplacement} à ${endReplacement}`,
                 starting: (approximate) => "à partir " + (approximate ? "de " : "du ")
-            }
+            },
+            place: placeMessages_fr
         };
         this.case = {
             classification: {

package/dist/org/Cities.d.ts

@@ -1,2 +1,2 @@
-import { CityService } from "./country/index.js";
-export declare const cityService: CityService;
+import { City } from "./country/index.js";
+export declare const cities: City[];

package/dist/org/Cities.js

@@ -1,16 +1,24 @@
-import { CityService, departmentService } from "./country/index.js";
 import { chinaCities } from "./cn/region/ChinaCities";
-const cities = [
-    ...chinaCities
-    /*  ...australiaCities,
-      ...brazilCities,
-      ...canadaCities,
-      ...europeCities,
-      ...indiaCities,
-      ...ukCities,
-      ...mozambiqueCities,
-      ...newZealandCities,
-      ...russiaCities,
-      ...usaCities*/
+import { usaCities } from "./us/region/UsaCities";
+import { australiaCities } from "./au";
+import { brazilCities } from "./br/region/BrazilCities";
+import { canadaCities } from "./ca/region/CanadaCities";
+import { europeCities } from "./eu/EuropeCities";
+import { indiaCities } from "./in/region/IndiaCities";
+import { ukCities } from "./uk/region/UkCities";
+import { mozambiqueCities } from "./mz/region/MozambiqueCities";
+import { newZealandCities } from "./nz/region/NewZealandCities";
+import { russiaCities } from "./ru/region/RussiaCities";
+export const cities = [
+    ...chinaCities,
+    ...australiaCities,
+    ...brazilCities,
+    ...canadaCities,
+    ...europeCities,
+    ...indiaCities,
+    ...ukCities,
+    ...mozambiqueCities,
+    ...newZealandCities,
+    ...russiaCities,
+    ...usaCities
 ];
-export const cityService = new CityService(cities, "org", departmentService);

package/dist/org/Organization.d.ts

@@ -1,15 +1,9 @@
 import { RR0Context } from "../RR0Context.js";
 import { OrganizationMessageOptions, OrganizationMessages } from "./OrganizationMessages.js";
 import { TitleMessage } from "./TitleMessage.js";
-import { Place } from "../place/index.js";
 import { RR0Data, RR0Event } from "@rr0/data";
-export declare enum OrganizationKind {
-    country = "country",
-    region = "region",
-    department = "department",
-    city = "city",
-    company = "company"
-}
+import { OrganizationKind } from "./OrganizationKind";
+import { Place } from "@rr0/place";
 export declare class Organization<M extends TitleMessage = OrganizationMessages> implements RR0Data {
     readonly id: string;
     readonly places: Place[];

package/dist/org/Organization.js

@@ -1,13 +1,5 @@
 import path from "path";
 import assert from "assert";
-export var OrganizationKind;
-(function (OrganizationKind) {
-    OrganizationKind["country"] = "country";
-    OrganizationKind["region"] = "region";
-    OrganizationKind["department"] = "department";
-    OrganizationKind["city"] = "city";
-    OrganizationKind["company"] = "company";
-})(OrganizationKind || (OrganizationKind = {}));
 export class Organization {
     constructor(id, places, kind, parent) {
         var _a;

package/dist/org/OrganizationFactory.d.ts

@@ -1,6 +1,7 @@
 import { Organization } from "./Organization.js";
 import { RR0EventFactory, TypedDataFactory } from "@rr0/data";
-export declare class OrganizationFactory extends TypedDataFactory<Organization> {
+import { OrganizationJson } from "./OrganizationJson";
+export declare class OrganizationFactory extends TypedDataFactory<Organization, OrganizationJson> {
     constructor(eventFactory: RR0EventFactory);
-    createFromData(data: Organization): Organization;
+    parse(dataJson: OrganizationJson): Organization;
 }

package/dist/org/OrganizationFactory.js

@@ -4,10 +4,9 @@ export class OrganizationFactory extends TypedDataFactory {
     constructor(eventFactory) {
         super(eventFactory, "org", ["index"]);
     }
-    createFromData(data) {
-        const id = data.id || data.dirName.replaceAll("/", "-");
-        const org = new Organization(id, data.places, data.kind, data.parent);
-        Object.assign(org, super.createFromData(data));
-        return org;
+    parse(dataJson) {
+        const base = super.parse(dataJson);
+        const id = base.id || dataJson.dirName.replaceAll("/", "-");
+        return new Organization(id, dataJson.places, dataJson.kind);
     }
 }

package/dist/org/OrganizationJson.d.ts

@@ -0,0 +1,17 @@
+import { OrganizationMessages } from "./OrganizationMessages.js";
+import { TitleMessage } from "./TitleMessage.js";
+import { RR0DataJson, RR0EventJson } from "@rr0/data";
+import { OrganizationKind } from "./OrganizationKind";
+import { Place } from "@rr0/place";
+export declare class OrganizationJson<M extends TitleMessage = OrganizationMessages> implements RR0DataJson {
+    readonly type = "org";
+    dirName: string;
+    events: RR0EventJson[];
+    readonly id: string;
+    places: Place[];
+    kind: OrganizationKind;
+    /**
+     * id of parent organization
+     */
+    parent?: string;
+}

package/dist/org/OrganizationJson.js

@@ -0,0 +1,6 @@
+export class OrganizationJson {
+    constructor() {
+        this.type = "org";
+        this.events = [];
+    }
+}

package/dist/org/OrganizationKind.d.ts

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

package/dist/org/OrganizationKind.js

@@ -0,0 +1,8 @@
+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/OrganizationService.d.ts

@@ -1,10 +1,12 @@
 import { Organization } from "./Organization.js";
 import { RR0Context } from "../RR0Context.js";
+import { OrganizationFactory } from "./OrganizationFactory";
 export declare class OrganizationService<O extends Organization = Organization, P extends Organization = undefined> {
     readonly orgs: O[];
     readonly rootDir: string;
+    protected factory: OrganizationFactory;
     readonly parentService: OrganizationService;
-    constructor(orgs: O[], rootDir: string, parentService: OrganizationService);
+    constructor(orgs: O[], rootDir: string, factory: OrganizationFactory, parentService: OrganizationService);
     static normalizeName(name: string): string;
     get(code: string, parent?: P): O | undefined;
     /**
@@ -12,7 +14,7 @@ export declare class OrganizationService<O extends Organization = Organization,
      * @param nameToFind
      * @param parent should be context.placeContext
      */
-    find(context: RR0Context, nameToFind: string, parent: P): Organization | undefined;
-    read(fileName: string): Promise<Organization<any>>;
+    find(context: RR0Context, nameToFind: string, parent: P): O | undefined;
+    read(fileName: string): Promise<O>;
     protected nameToFind(context: RR0Context, org: O, nameToFind: string): string;
 }

package/dist/org/OrganizationService.js

@@ -1,10 +1,11 @@
-import fs from "fs";
 import { StringUtil } from "../util/string/StringUtil.js";
 import assert from "assert";
+import { FileContents } from "@javarome/fileutil";
 export class OrganizationService {
-    constructor(orgs = [], rootDir, parentService) {
+    constructor(orgs, rootDir, factory, parentService) {
         this.orgs = orgs;
         this.rootDir = rootDir;
+        this.factory = factory;
         this.parentService = parentService;
     }
     static normalizeName(name) {
@@ -51,10 +52,10 @@ export class OrganizationService {
         return foundOrg;
     }
     async read(fileName) {
-        const fileBuffer = fs.readFileSync(this.rootDir + fileName);
-        const place = JSON.parse(fileBuffer.toString());
-        this.orgs.push(place);
-        return place;
+        const file = FileContents.read(this.rootDir + fileName);
+        const org = this.factory.create(file);
+        this.orgs.push(org);
+        return org;
     }
     nameToFind(context, org, nameToFind) {
         return OrganizationService.normalizeName(nameToFind);

package/dist/org/au/region/AustraliaRegion.d.ts

@@ -1,4 +1,4 @@
 import { AustraliaRegionCode } from "./AustraliaRegionCode.js";
-import { Place } from "../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { Region } from "../../country/region/Region.js";
 export declare function australiaRegion(code: AustraliaRegionCode, place: Place): Region<import("../../index.js").RegionMessages<any>, AustraliaRegionCode>;

package/dist/org/au/region/nsw/NewSouthWales.js

@@ -1,4 +1,4 @@
 import { australiaRegion } from "../AustraliaRegion.js";
 import { AustraliaRegionCode } from "../AustraliaRegionCode.js";
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 export let newSouthWales = australiaRegion(AustraliaRegionCode.nsw, Place.fromDMS("32°0'S,147°0'E"));

package/dist/org/au/region/nsw/dunmore/Dunmore.js

@@ -1,5 +1,5 @@
 import { NewSouthWalesCityCode } from "../NewSouthWalesCityCode.js";
-import { Place } from "../../../../../place/Place.js";
+import { Place } from "@rr0/place";
 import { newSouthWales } from "../NewSouthWales.js";
 import { City } from "../../../../country/region/department/city/City.js";
 export const dunmore = new City(NewSouthWalesCityCode.Dunmore, newSouthWales, [Place.fromLocation(-34.62, 150.83)]);

package/dist/org/au/region/sa/SouthAustralia.js

@@ -1,4 +1,4 @@
 import { australiaRegion } from "../AustraliaRegion.js";
 import { AustraliaRegionCode } from "../AustraliaRegionCode.js";
-import { Place } from "../../../../place/Place.js";
+import { Place } from "@rr0/place";
 export let southAustralia = australiaRegion(AustraliaRegionCode.sa, Place.fromDMS("30°0'S 135°0'E"));