@rr0/cms 0.3.31 → 0.3.33

package/dist/CMSGenerator.d.ts

@@ -11,6 +11,7 @@ import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer.js";
 import { CountryService } from "./org/country/CountryService.js";
 import { CMSContext } from "./CMSContext.js";
 import { TimeOptions } from "./time/TimeOptions.js";
+import { DataOptions } from "./DataOptions.js";
 export interface CMSGeneratorOptions {
     contentRoots: string[];
     copies: string[];
@@ -18,7 +19,10 @@ export interface CMSGeneratorOptions {
     locale: string;
     googleMapsApiKey: string;
     mail: string;
-    timeOptions: TimeOptions;
+    dataOptions: {
+        time: TimeOptions;
+        org: DataOptions;
+    };
     siteBaseUrl: string;
     timeFormat: Intl.DateTimeFormatOptions;
     directoryPages: string[];
@@ -62,7 +66,7 @@ export declare class CMSGenerator implements CMSContext {
     readonly config: FileWriteConfig;
     readonly context: RR0ContextImpl;
     readonly placeService: GooglePlaceService;
-    readonly orgService: OrganizationService<any>;
+    readonly orgService: OrganizationService;
     readonly caseFactory: CaseFactory;
     readonly dataService: AllDataService;
     readonly peopleFactory: PeopleFactory;

package/dist/CMSGenerator.js

@@ -41,6 +41,7 @@ const outputFunc = async (context, outFile) => {
 export class CMSGenerator {
     constructor(options) {
         this.options = options;
+        this.http = new HttpSource();
         this.config = {
             getOutputPath(context) {
                 return path.join(options.outDir, context.file.name);
@@ -48,16 +49,7 @@ export class CMSGenerator {
         };
         const eventFactory = new RR0EventFactory();
         const orgFactory = new CmsOrganizationFactory(eventFactory);
-        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);
-        const cityService = new CityService(cities, "org", orgFactory, departmentService);
-        this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
-        this.orgService = new OrganizationService([], "org", orgFactory, undefined);
-        this.cityService = cityService;
-        const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
-        const timeOptions = options.timeOptions;
-        const timeUrlBuilder = this.timeUrlBuilder = new TimeUrlBuilder(timeOptions);
+        const orgConfig = options.dataOptions.org;
         const sightingFactory = new EventDataFactory(eventFactory, ["sighting"], ["index"]);
         const caseFactory = this.caseFactory = new CaseFactory(eventFactory);
         const peopleFactory = this.peopleFactory = new PeopleFactory(eventFactory);
@@ -69,9 +61,18 @@ export class CMSGenerator {
         dataService.getFromDir("", ["people", "case"]).then(data => {
             console.debug(data);
         });
+        this.orgService = new OrganizationService(dataService, orgFactory, orgConfig, undefined, []);
+        const countryService = this.countryService = new CountryService(dataService, orgFactory, orgConfig, undefined, countries);
+        const regionService = new RegionService(dataService, orgFactory, orgConfig, countryService, regions);
+        const departmentService = this.departmentService = new DepartmentService(dataService, orgFactory, orgConfig, regionService, departments);
+        const cityService = new CityService(dataService, orgFactory, orgConfig, departmentService, cities);
+        this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
+        this.cityService = cityService;
+        const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
+        const timeOptions = options.dataOptions.time;
+        const timeUrlBuilder = this.timeUrlBuilder = new TimeUrlBuilder(timeOptions);
         this.timeRenderer = new TimeRenderer(timeUrlBuilder, timeTextBuilder);
         this.timeService = new TimeService(dataService, timeOptions);
-        this.http = new HttpSource();
     }
     async generate(args) {
         const timeContext = new TimeContext();
@@ -90,7 +91,7 @@ export class CMSGenerator {
         const { timeFiles, timeElementFactory, timeReplacer } = this.setupTime(context);
         const orgFactory = dataService.factories.find(f => f.type === "org");
         if (orgFactory) {
-            const orgFiles = await orgFactory.getFiles();
+            const orgFiles = this.options.dataOptions.org.files;
             context.setVar("orgFilesCount", orgFiles.length);
         }
         const placeFactory = dataService.factories.find(f => f.type === "place");
@@ -225,7 +226,7 @@ export class CMSGenerator {
         return { sourceRenderer, sourceFactory, sourceReplacerFactory };
     }
     setupTime(context) {
-        const timeFiles = this.options.timeOptions.files;
+        const timeFiles = this.options.dataOptions.time.files;
         context.setVar("timeFilesCount", timeFiles.length);
         const timeElementFactory = new TimeElementFactory(this.timeRenderer);
         const timeReplacer = new TimeReplacer(timeElementFactory);
@@ -235,7 +236,7 @@ export class CMSGenerator {
         const peopleFiles = await this.peopleFactory.getFiles();
         const peopleService = new PeopleService(this.dataService, this.peopleFactory, { files: peopleFiles, rootDir: "people" });
         const peopleList = await peopleService.getAll();
-        context.setVar("peopleFilesCount", peopleList.length);
+        context.setVar("peopleFilesCount", peopleFiles.length);
         const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, this.config, peopleService, peopleRenderer, this.options.directoryExcluded);
         const directoryOptions = this.options.directoryOptions;
         for (const directoryOption in directoryOptions) {

package/dist/CMSGenerator.test.js

@@ -85,6 +85,7 @@ describe("Build", () => {
         "people/contactes.html", "people/ufologues.html", "tech/info/Personnes.html", "people/Contributeurs.html"
     ].map(path => rr0TestUtil.filePath(path));
     getTimeFiles().then(async (timeFiles) => {
+        const orgFiles = await glob("test/org/**/index.html");
         const directoryOptions = {
             root: rr0TestUtil.filePath("people/index.html"),
             scientists: rr0TestUtil.filePath("people/scientifiques.html"),
@@ -102,6 +103,11 @@ describe("Build", () => {
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
         const timeOptions = { rootDir: rr0TestUtil.filePath("time"), files: timeFiles };
+        const orgOptions = { rootDir: rr0TestUtil.filePath("org"), files: orgFiles };
+        const dataOptions = {
+            time: timeOptions,
+            org: orgOptions
+        };
         // const actions: ChronologyReplacerActions = {read: ["backup", "fetch"], write: ["backup", "pages"]}
         // const actions: ChronologyReplacerActions = {read: [], write: ["backup"]}
         const actions = { read: ["fetch"], write: ["backup"] };
@@ -137,7 +143,7 @@ describe("Build", () => {
             new UnitReplaceCommand()
         ];
         const generator = new CMSGenerator({
-            contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
+            contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, dataOptions,
             siteBaseUrl, timeFormat, directoryPages,
             ufoCaseDirectoryFile: rr0TestUtil.filePath("science/crypto/ufo/enquete/dossier/index.html"),
             ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(path => rr0TestUtil.filePath(path)),

package/dist/DataOptions.d.ts

@@ -0,0 +1,4 @@
+export type DataOptions = {
+    readonly rootDir: string;
+    readonly files: string[];
+};

package/dist/DataOptions.js

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

package/dist/anchor/CaseAnchorHandler.js

@@ -8,7 +8,7 @@ export class CaseAnchorHandler {
     async handle(context, link, pathToSearch) {
         var _a, _b, _c, _d, _e, _f;
         if (!link.title) {
-            const foundCases = await this.caseService.get(pathToSearch);
+            const foundCases = await this.caseService.getFromDir(pathToSearch);
             const aCase = foundCases[0];
             if (aCase) {
                 const caseContext = context.clone();

package/dist/index.d.ts

@@ -30,3 +30,4 @@ export * from "./RR0Context.js";
 export * from "./TableReplaceCommand.js";
 export * from "./CMSGenerator.js";
 export * from "./CMSContext.js";
+export * from "./DataOptions.js";

package/dist/index.js

@@ -30,3 +30,4 @@ export * from "./RR0Context.js";
 export * from "./TableReplaceCommand.js";
 export * from "./CMSGenerator.js";
 export * from "./CMSContext.js";
+export * from "./DataOptions.js";

package/dist/note/NoteRenderer.js

@@ -15,6 +15,7 @@ export class NoteRenderer {
         const anchor = doc.createElement("span");
         anchor.id = noteId;
         anchor.className = "anchor";
+        anchor.ariaHidden = "true";
         replacement.append(anchor, contents);
         return replacement;
     }

package/dist/org/CmsOrganizationFactory.d.ts

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

package/dist/org/OrganizationService.d.ts

@@ -1,14 +1,16 @@
 import { CmsOrganization } from "./CmsOrganization.js";
 import { RR0Context } from "../RR0Context.js";
 import { CmsOrganizationFactory } from "./CmsOrganizationFactory.js";
-export declare class OrganizationService<O extends CmsOrganization = CmsOrganization, P extends CmsOrganization = undefined> {
-    readonly orgs: O[];
-    readonly rootDir: string;
-    protected factory: CmsOrganizationFactory;
+import { AbstractDataService, AllDataService, OrganizationJson } from "@rr0/data";
+import { DataOptions } from "../DataOptions.js";
+export type OrganizationServiceConfig = DataOptions;
+export declare class OrganizationService<O extends CmsOrganization = CmsOrganization, P extends CmsOrganization = undefined> extends AbstractDataService<O, OrganizationJson> {
+    protected config: OrganizationServiceConfig;
     readonly parentService: OrganizationService;
-    constructor(orgs: O[], rootDir: string, factory: CmsOrganizationFactory, parentService: OrganizationService);
+    protected orgs: O[];
+    constructor(dataService: AllDataService, factory: CmsOrganizationFactory, config: OrganizationServiceConfig, parentService: OrganizationService, orgs: O[]);
     static normalizeName(name: string): string;
-    get(code: string, parent?: P): O | undefined;
+    getById(code: string, parent?: P): O | undefined;
     /**
      * @param context
      * @param nameToFind

package/dist/org/OrganizationService.js

@@ -1,17 +1,18 @@
 import { StringUtil } from "../util/string/StringUtil.js";
 import assert from "assert";
 import { FileContents } from "@javarome/fileutil";
-export class OrganizationService {
-    constructor(orgs, rootDir, factory, parentService) {
-        this.orgs = orgs;
-        this.rootDir = rootDir;
-        this.factory = factory;
+import { AbstractDataService } from "@rr0/data";
+export class OrganizationService extends AbstractDataService {
+    constructor(dataService, factory, config, parentService, orgs) {
+        super(dataService, factory, config.files);
+        this.config = config;
         this.parentService = parentService;
+        this.orgs = orgs;
     }
     static normalizeName(name) {
         return StringUtil.removeAccents(name.toLowerCase().replaceAll(" ", "-"));
     }
-    get(code, parent = undefined) {
+    getById(code, parent = undefined) {
         return this.orgs.find(org => {
             const foundParent = !parent || org.parent === parent;
             const foundOrg = org.id === code ? org : undefined;
@@ -52,8 +53,8 @@ export class OrganizationService {
         return foundOrg;
     }
     async read(fileName) {
-        const file = FileContents.read(this.rootDir + fileName);
-        const org = this.factory.create(file);
+        const file = FileContents.read(this.config.rootDir + fileName);
+        const org = this.factory.createFromFile(file);
         this.orgs.push(org);
         return org;
     }

package/dist/org/country/CountryService.test.js

@@ -5,8 +5,8 @@ import { rr0TestUtil } from "../../test/index.js";
 describe("CountryService", () => {
     test("get", () => {
         const countryService = rr0TestUtil.countryService;
-        expect(countryService.get(france.id)).toBe(france);
-        expect(countryService.get(usa.id)).toBe(usa);
-        expect(countryService.get(usa.id)).not.toBe(france);
+        expect(countryService.getById(france.id)).toBe(france);
+        expect(countryService.getById(usa.id)).toBe(usa);
+        expect(countryService.getById(usa.id)).not.toBe(france);
     });
 });

package/dist/org/country/region/RegionService.test.js

@@ -7,8 +7,8 @@ import { rr0TestUtil } from "../../../test/index.js";
 describe("RegionService", () => {
     test("get", () => {
         const regionService = rr0TestUtil.regionService;
-        expect(regionService.get(ileDeFrance.id, france)).toBe(ileDeFrance);
-        expect(regionService.get(alabama.id, usa)).toBe(alabama);
-        expect(regionService.get(alabama.id, france)).toBeUndefined();
+        expect(regionService.getById(ileDeFrance.id, france)).toBe(ileDeFrance);
+        expect(regionService.getById(alabama.id, usa)).toBe(alabama);
+        expect(regionService.getById(alabama.id, france)).toBeUndefined();
     });
 });

package/dist/org/country/region/department/DepartmentService.test.js

@@ -7,8 +7,8 @@ import { rr0TestUtil } from "../../../../test/index.js";
 describe("DepartmentService", () => {
     test("get", () => {
         const departmentService = rr0TestUtil.departmentService;
-        expect(departmentService.get(hautsDeSeine.id, ileDeFrance)).toBe(hautsDeSeine);
-        expect(departmentService.get(hautsDeSeine.id, undefined)).toBe(hautsDeSeine);
-        expect(departmentService.get(sanDiego.id, california)).toBe(sanDiego);
+        expect(departmentService.getById(hautsDeSeine.id, ileDeFrance)).toBe(hautsDeSeine);
+        expect(departmentService.getById(hautsDeSeine.id, undefined)).toBe(hautsDeSeine);
+        expect(departmentService.getById(sanDiego.id, california)).toBe(sanDiego);
     });
 });

package/dist/place/PlaceReplacer.test.js

@@ -24,7 +24,7 @@ class MockPlaceService extends PlaceService {
 }
 class MockOrganizationService extends OrganizationService {
     constructor(dirName) {
-        super([], "org", rr0TestUtil.orgFactory, null);
+        super(null, rr0TestUtil.orgFactory, { rootDir: "", files: [] }, null, []);
         this.dirName = dirName;
     }
     async read(_fileName) {

package/dist/science/crypto/ufo/enquete/dossier/CaseDirectoryStep.js

@@ -69,7 +69,7 @@ export class CaseDirectoryStep extends DirectoryStep {
         const cases = [];
         for (const dirName of dirNames) {
             try {
-                const dirCases = await this.caseService.get(dirName);
+                const dirCases = await this.caseService.getFromDir(dirName);
                 cases.push(...dirCases);
             }
             catch (e) {

package/dist/source/SourceReplacer.js

@@ -14,6 +14,7 @@ export class SourceReplacer {
         const replacement = outputDoc.createElement("span");
         replacement.className = "source-id";
         replacement.ariaLabel = "Source";
+        replacement.ariaHidden = "true";
         const sourceId = this.counter.next(context);
         replacement.textContent = sourceId;
         const sourceContentsEl = outputDoc.createElement("span");
@@ -21,6 +22,7 @@ export class SourceReplacer {
         await this.content(context, original, sourceContentsEl);
         const anchor = outputDoc.createElement("span");
         anchor.id = sourceId;
+        anchor.ariaHidden = "true";
         anchor.className = "anchor";
         replacement.append(anchor, sourceContentsEl);
         return replacement;

package/dist/test/RR0TestUtil.d.ts

@@ -21,7 +21,7 @@ export declare class RR0TestUtil implements CMSContext {
     readonly departmentService: DepartmentService;
     readonly countryService: CountryService;
     readonly regionService: RegionService;
-    constructor(rootDir?: string, outDir?: string);
+    constructor(rootDir?: string, outDir?: string, orgFiles?: string[]);
     newContext(inputFileName: string, contents?: string, locale?: string): RR0Context;
     filePath(inputFileName: string): string;
     newHtmlContext(inputFileName: string, contents?: string, locale?: string): HtmlRR0Context;

package/dist/test/RR0TestUtil.js

@@ -10,7 +10,7 @@ import { FileContents } from "@javarome/fileutil";
 import { AllDataService, EventDataFactory, PeopleFactory, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { CountryService } from "../org/country/CountryService.js";
 export class RR0TestUtil {
-    constructor(rootDir = "test", outDir = "out") {
+    constructor(rootDir = "test", outDir = "out", orgFiles = []) {
         this.rootDir = rootDir;
         this.outDir = outDir;
         this.config = {
@@ -30,21 +30,22 @@ export class RR0TestUtil {
         const eventFactory = new RR0EventFactory();
         const sightingFactory = new EventDataFactory(eventFactory, ["sighting"], ["index"]);
         const orgFactory = this.orgFactory = new CmsOrganizationFactory(eventFactory);
-        this.orgService = new OrganizationService([], "org", orgFactory, undefined);
         this.caseFactory = new CaseFactory(eventFactory);
         this.peopleFactory = new PeopleFactory(eventFactory);
         const apiFactory = new APIFactory(eventFactory);
         const bookFactory = new TypedDataFactory(eventFactory, "book");
         const articleFactory = new TypedDataFactory(eventFactory, "article");
-        this.dataService = new AllDataService([orgFactory, this.caseFactory, this.peopleFactory, bookFactory, articleFactory, sightingFactory, apiFactory]);
-        this.dataService.getFromDir("", ["people", "case"]).then(data => {
+        const dataService = this.dataService = new AllDataService([orgFactory, this.caseFactory, this.peopleFactory, bookFactory, articleFactory, sightingFactory, apiFactory]);
+        dataService.getFromDir("", ["people", "case"]).then(data => {
             //   console.debug(data)
         });
+        const orgConfig = { rootDir: this.filePath("org"), files: orgFiles };
+        this.orgService = new OrganizationService(dataService, orgFactory, orgConfig, undefined, []);
         this.time = new TimeTestUtil(this);
-        const countryService = this.countryService = new CountryService(countries, "org", orgFactory, undefined);
-        const regionService = this.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 countryService = this.countryService = new CountryService(dataService, orgFactory, orgConfig, undefined, countries);
+        const regionService = this.regionService = new RegionService(dataService, orgFactory, orgConfig, countryService, regions);
+        const departmentService = this.departmentService = new DepartmentService(dataService, orgFactory, orgConfig, regionService, departments);
+        this.cityService = new CityService(dataService, orgFactory, orgConfig, departmentService, cities);
     }
     newContext(inputFileName, contents, locale = "fr") {
         const context = new RR0ContextImpl(locale, new TimeContext(), this.config);

package/dist/time/TimeDirectoryStep.js

@@ -76,7 +76,7 @@ export class TimeDirectoryStep extends DirectoryStep {
         const events = [];
         for (const dirName of dirNames) {
             try {
-                const dirEvents = await this.service.get(dirName);
+                const dirEvents = await this.service.getFromDir(dirName);
                 events.push(...dirEvents);
             }
             catch (e) {

package/dist/time/TimeOptions.d.ts

@@ -1,4 +1,2 @@
-export type TimeOptions = {
-    readonly rootDir: string;
-    readonly files: string[];
-};
+import { DataOptions } from "../DataOptions.js";
+export type TimeOptions = DataOptions;

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.js

@@ -19,7 +19,7 @@ export class BaseOvniFranceCaseSummaryRR0Mapper {
             publication: { publisher: this.copyright, time: EdtfDate.fromDate(sourceTime) }
         };
         const depCode = sourceCase.depCode;
-        const dep = this.depService.get(depCode, undefined);
+        const dep = this.depService.getById(depCode, undefined);
         assert.ok(dep, `Could not find department "${depCode}"`);
         const placeName = sourceCase.city;
         const city = this.cityService.find(context, placeName, dep);

package/dist/time/datasource/nuforc/NuforcRR0Mapper.js

@@ -67,7 +67,7 @@ export class NuforcRR0Mapper {
         assert.ok(sourceCase.country, `NUFORC country code is ${sourceCase.country}`);
         const countryCode = NuforcRR0Mapper.countryMap[sourceCase.country];
         assert.ok(countryCode, `Could not find RR0 country to map from NUFORC code ${countryCode}`);
-        const country = this.countryService.get(countryCode);
+        const country = this.countryService.getById(countryCode);
         assert.ok(country, `Could not find country "${countryCode}"`);
         const placeItems = /(.+?)(:?\s+\((.+)\))?$/.exec(sourceCase.city);
         const placeName = placeItems[1];

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.31",
+  "version": "0.3.33",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.7",
     "@rr0/common": "^1.1.3",
-    "@rr0/data": "^0.3.27",
+    "@rr0/data": "^0.3.30",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.3",
     "@rr0/time": "^0.11.0",