@rr0/cms 0.3.1 → 0.3.2

package/dist/RR0Build.js

@@ -3,7 +3,7 @@ import fs from "fs";
 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 { PlaceReplacerFactory } from "./place/index.js";
-import { cities, CityService, countries, departments, DepartmentService, OrganizationFactory, OrganizationService, regions, RegionService } from "./org/index.js";
+import { cities, CityService, countries, departments, DepartmentService, CmsOrganizationFactory, OrganizationService, regions, RegionService } from "./org/index.js";
 import { RR0ContextImpl } from "./RR0Context.js";
 import { HtmlTable } from "./util/index.js";
 import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
@@ -60,7 +60,7 @@ export class RR0Build {
         context.setVar("mail", options.mail);
         const eventFactory = new RR0EventFactory();
         this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
-        const orgFactory = new OrganizationFactory(eventFactory);
+        const orgFactory = new CmsOrganizationFactory(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);

package/dist/RR0Build.test.js

@@ -6,6 +6,7 @@ import * as process from "node:process";
 describe("Build", () => {
     console.time("ssg");
     const args = {
+        contents: ["test/org/us/faa/index.html"],
         force: "true"
     };
     const cliContents = args.contents;
@@ -89,10 +90,7 @@ describe("Build", () => {
         const sourceRegistryFileName = testFilePath("source/index.json");
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
-        const timeOptions = {
-            root: testFilePath("time"),
-            files: timeFiles
-        };
+        const timeOptions = { root: testFilePath("time"), files: timeFiles };
         const build = new RR0Build({
             contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
             siteBaseUrl, timeFormat, directoryPages,

package/dist/org/CmsOrganization.d.ts

@@ -5,11 +5,8 @@ import { Organization } from "@rr0/data";
 import { OrganizationKind } from "@rr0/data";
 import { Place } from "@rr0/place";
 export declare class CmsOrganization<M extends TitleMessage = OrganizationMessages> extends Organization {
-    readonly id: string;
-    readonly places: Place[];
-    readonly kind: OrganizationKind;
-    readonly parent?: CmsOrganization;
     constructor(id: string, places: Place[], kind: OrganizationKind, parent?: CmsOrganization);
+    get parent(): CmsOrganization | undefined;
     getMessages(context: RR0Context): M;
     getTitle(context: RR0Context, options?: OrganizationMessageOptions): string;
 }

package/dist/org/CmsOrganization.js

@@ -3,10 +3,9 @@ import { Organization } from "@rr0/data";
 export class CmsOrganization extends Organization {
     constructor(id, places, kind, parent) {
         super(id, places, kind, parent);
-        this.id = id;
-        this.places = places;
-        this.kind = kind;
-        this.parent = parent;
+    }
+    get parent() {
+        return super.parent;
     }
     getMessages(context) {
         const parent = this.parent;

package/dist/org/CmsOrganizationFactory.d.ts

@@ -0,0 +1,7 @@
+import { CmsOrganization } from "./CmsOrganization.js";
+import { OrganizationFactory, RR0EventFactory } from "@rr0/data";
+import { OrganizationJson } from "@rr0/data/dist/org/OrganizationJson";
+export declare class CmsOrganizationFactory extends OrganizationFactory {
+    constructor(eventFactory: RR0EventFactory);
+    parse(dataJson: OrganizationJson): CmsOrganization;
+}

package/dist/org/CmsOrganizationFactory.js

@@ -0,0 +1,13 @@
+import { CmsOrganization } from "./CmsOrganization.js";
+import { OrganizationFactory } from "@rr0/data";
+export class CmsOrganizationFactory extends OrganizationFactory {
+    constructor(eventFactory) {
+        super(eventFactory);
+    }
+    parse(dataJson) {
+        const base = super.parse(dataJson);
+        const org = new CmsOrganization(base.id, base.places, base.kind);
+        org.title = base.title;
+        return org;
+    }
+}

package/dist/org/OrganizationService.d.ts

@@ -1,12 +1,12 @@
 import { CmsOrganization } from "./CmsOrganization.js";
 import { RR0Context } from "../RR0Context.js";
-import { OrganizationFactory } from "./OrganizationFactory";
+import { CmsOrganizationFactory } from "./CmsOrganizationFactory";
 export declare class OrganizationService<O extends CmsOrganization = CmsOrganization, P extends CmsOrganization = undefined> {
     readonly orgs: O[];
     readonly rootDir: string;
-    protected factory: OrganizationFactory;
+    protected factory: CmsOrganizationFactory;
     readonly parentService: OrganizationService;
-    constructor(orgs: O[], rootDir: string, factory: OrganizationFactory, parentService: OrganizationService);
+    constructor(orgs: O[], rootDir: string, factory: CmsOrganizationFactory, parentService: OrganizationService);
     static normalizeName(name: string): string;
     get(code: string, parent?: P): O | undefined;
     /**

package/dist/org/br/Brazil.js

@@ -1,6 +1,5 @@
-import { CountryCode } from "@rr0/data";
+import { CountryCode, OrganizationKind } from "@rr0/data";
 import { CmsOrganization } from "../CmsOrganization.js";
-import { OrganizationKind } from "@rr0/data";
 export const brazil = new CmsOrganization(CountryCode.br, [], OrganizationKind.country);
 export function brazilRegion(code, place) {
     return new CmsOrganization(code, [place], OrganizationKind.region, brazil);

package/dist/org/index.d.ts

@@ -3,7 +3,7 @@ export * from "./CountryMessagesList.js";
 export * from "./CountryMessageList_en.js";
 export * from "./CountryMessageList_fr.js";
 export * from "./CmsOrganization.js";
-export * from "./OrganizationFactory.js";
+export * from "./CmsOrganizationFactory.js";
 export * from "./OrganizationMessages.js";
 export * from "./OrganizationService.js";
 export * from "./OrgMessages.js";

package/dist/org/index.js

@@ -3,7 +3,7 @@ export * from "./CountryMessagesList.js";
 export * from "./CountryMessageList_en.js";
 export * from "./CountryMessageList_fr.js";
 export * from "./CmsOrganization.js";
-export * from "./OrganizationFactory.js";
+export * from "./CmsOrganizationFactory.js";
 export * from "./OrganizationMessages.js";
 export * from "./OrganizationService.js";
 export * from "./OrgMessages.js";

package/dist/place/PlaceReplacer.test.js

@@ -37,6 +37,8 @@ class MockOrganizationService extends OrganizationService {
             getTitle(_context) {
                 return title;
             },
+            parent: undefined,
+            title,
             places: [new Place([new PlaceLocation(35.87555555555556, -106.32416666666666)])],
             getMessages: (_context) => new OrganizationMessages([title]),
             events: []

package/dist/test/RR0TestUtil.d.ts

@@ -1,6 +1,6 @@
 import { HtmlRR0Context, RR0Context } from "../RR0Context.js";
 import { FileWriteConfig } from "ssg-api";
-import { CityService, DepartmentService, OrganizationFactory, OrganizationService, RegionService } from "../org/index.js";
+import { CityService, DepartmentService, CmsOrganizationFactory, OrganizationService, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
 import { AllDataService, PeopleFactory } from "@rr0/data";
@@ -16,7 +16,7 @@ export declare class RR0TestUtil {
     readonly time: TimeTestUtil;
     readonly orgService: OrganizationService<any, undefined>;
     readonly cityService: CityService;
-    readonly orgFactory: OrganizationFactory;
+    readonly orgFactory: CmsOrganizationFactory;
     readonly departmentService: DepartmentService;
     readonly countryService: CountryService;
     readonly regionService: RegionService;

package/dist/test/RR0TestUtil.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { RR0ContextImpl } from "../RR0Context.js";
 import { HtmlFileContents } from "ssg-api";
-import { cities, CityService, countries, departments, DepartmentService, OrganizationFactory, OrganizationService, regions, RegionService } from "../org/index.js";
+import { cities, CityService, countries, departments, DepartmentService, CmsOrganizationFactory, OrganizationService, regions, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
 import { APIFactory } from "../tech/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
@@ -29,7 +29,7 @@ export class RR0TestUtil {
         };
         const eventFactory = new RR0EventFactory();
         const sightingFactory = new EventDataFactory(eventFactory, "sighting", ["index"]);
-        const orgFactory = this.orgFactory = new OrganizationFactory(eventFactory);
+        const orgFactory = this.orgFactory = new CmsOrganizationFactory(eventFactory);
         this.orgService = new OrganizationService([], "org", orgFactory, undefined);
         this.caseFactory = new CaseFactory(eventFactory);
         this.peopleFactory = new PeopleFactory(eventFactory);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.6",
     "@rr0/common": "^1.1.3",
-    "@rr0/data": "^0.3.1",
+    "@rr0/data": "^0.3.4",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.1",
     "@rr0/time": "^0.9.2",

package/dist/org/OrganizationFactory.d.ts

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

package/dist/org/OrganizationFactory.js

@@ -1,12 +0,0 @@
-import { CmsOrganization } from "./CmsOrganization.js";
-import { TypedDataFactory } from "@rr0/data";
-export class OrganizationFactory extends TypedDataFactory {
-    constructor(eventFactory) {
-        super(eventFactory, "org", ["index"]);
-    }
-    parse(dataJson) {
-        const base = super.parse(dataJson);
-        const id = base.id || dataJson.dirName.replaceAll("/", "-");
-        return new CmsOrganization(id, dataJson.places, dataJson.kind);
-    }
-}

package/dist/org/OrganizationJson.d.ts

@@ -1,17 +0,0 @@
-import { OrganizationMessages } from "./OrganizationMessages.js";
-import { TitleMessage } from "./TitleMessage.js";
-import { RR0DataJson, RR0EventJson } from "@rr0/data";
-import { OrganizationKind } from "@rr0/data";
-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

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