@rr0/cms 0.3.29 → 0.3.31

package/dist/CMSGenerator.d.ts

@@ -86,7 +86,7 @@ export declare class CMSGenerator implements CMSContext {
         timeElementFactory: TimeElementFactory;
         timeReplacer: TimeReplacer;
     };
-    protected peopleSetup(context: RR0ContextImpl, peopleRenderer: PeopleHtmlRenderer, copies: string[]): Promise<{
+    protected setupPeople(context: RR0ContextImpl, peopleRenderer: PeopleHtmlRenderer, copies: string[]): Promise<{
         peopleService: PeopleService;
         peopleSteps: import("./people/PeopleDirectoryStep.js").PeopleDirectoryStep[];
         copies: string[];

package/dist/CMSGenerator.js

@@ -88,9 +88,19 @@ export class CMSGenerator {
         const timeRenderer = this.timeRenderer;
         const timeFormat = this.options.timeFormat;
         const { timeFiles, timeElementFactory, timeReplacer } = this.setupTime(context);
+        const orgFactory = dataService.factories.find(f => f.type === "org");
+        if (orgFactory) {
+            const orgFiles = await orgFactory.getFiles();
+            context.setVar("orgFilesCount", orgFiles.length);
+        }
+        const placeFactory = dataService.factories.find(f => f.type === "place");
+        if (placeFactory) {
+            const placeFiles = await placeFactory.getFiles();
+            context.setVar("placeFilesCount", placeFiles.length);
+        }
         const { caseService, ufoCasesStep } = await this.setupCases(timeElementFactory);
         const peopleRenderer = new PeopleHtmlRenderer();
-        const { peopleService, peopleSteps } = await this.peopleSetup(context, peopleRenderer, this.options.copies);
+        const { peopleService, peopleSteps } = await this.setupPeople(context, peopleRenderer, this.options.copies);
         const timeTextBuilder = this.timeTextBuilder;
         const searchVisitor = new SearchVisitor({ notIndexedUrls: ["404.html", "Referencement.html"], indexWords: false }, timeTextBuilder);
         const { sourceRenderer, sourceFactory, sourceReplacerFactory } = this.setupSources(timeTextBuilder, timeFormat);
@@ -221,7 +231,7 @@ export class CMSGenerator {
         const timeReplacer = new TimeReplacer(timeElementFactory);
         return { timeFiles, timeElementFactory, timeReplacer };
     }
-    async peopleSetup(context, peopleRenderer, copies) {
+    async setupPeople(context, peopleRenderer, copies) {
         const peopleFiles = await this.peopleFactory.getFiles();
         const peopleService = new PeopleService(this.dataService, this.peopleFactory, { files: peopleFiles, rootDir: "people" });
         const peopleList = await peopleService.getAll();

package/dist/CMSGenerator.test.js

@@ -27,7 +27,7 @@ export async function getTimeFiles() {
 describe("Build", () => {
     console.time("ssg");
     const args = {
-        contents: ["test/**/*.html"],
+        contents: ["test/*.html"],
         force: "true"
     };
     const cliContents = args.contents;

package/dist/DataContentVisitor.js

@@ -65,7 +65,6 @@ export class DataContentVisitor {
         const doc = context.file.document;
         const contents = doc.querySelector(".contents");
         if (contents) {
-            const side = context.people ? "left" : "right";
             const imgEl = contents.querySelector("img");
             const caption = imageData.name;
             const src = imageData.url;
@@ -77,7 +76,6 @@ export class DataContentVisitor {
                 figcaptionEl.innerHTML = caption;
                 await this.eventRenderer.renderEnd(context, imageData, figcaptionEl);
                 const figureEl = doc.createElement("figure");
-                figureEl.classList.add(side, "side");
                 figureEl.append(imgEl);
                 figureEl.append(figcaptionEl);
                 const insertEl = contents.querySelector("*");

package/dist/people/PeopleReplacer.test.js

@@ -8,7 +8,9 @@ describe("PeopleReplacer", () => {
     const rootDir = rr0TestUtil.filePath("people");
     const files = [
         path.join(rootDir, "b/BeauJerome"),
-        path.join(rootDir, "h/HynekJosefAllen")
+        path.join(rootDir, "h/HynekJosefAllen"),
+        path.join(rootDir, "r/ReaganRonald"),
+        path.join(rootDir, "v/VertongenJeanLuc")
     ];
     const peopleFactory = new PeopleFactory(new RR0EventFactory());
     function createPeopleElement(context, content, title) {
@@ -42,10 +44,15 @@ describe("PeopleReplacer", () => {
         const peopleRenderer = new PeopleHtmlRenderer();
         const replacer = new PeopleReplacer(peopleService, peopleRenderer);
         const context = rr0TestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");
+        {
+            const peopleWithTitle = createPeopleElement(context, "Jean-Luc Vertongen");
+            const replacement = await replacer.replacement(context, peopleWithTitle);
+            expect(replacement.outerHTML).toBe(`<span class="peopl" translate="no"><a href="/src/people/v/VertongenJeanLuc/">Jean-Luc Vertongen</a></span>`);
+        }
         {
             const peopleWithTitle = createPeopleElement(context, "Ronald Reagan", "Ronald Wilson Reagan");
-            let replacement = await replacer.replacement(context, peopleWithTitle);
-            expect(replacement.outerHTML).toBe(`<span translate="no"><a href="/src/people/r/ReaganRonald/">Ronald Reagan</a></span>`);
+            const replacement = await replacer.replacement(context, peopleWithTitle);
+            expect(replacement.outerHTML).toBe(`<span class="peopl" translate="no"><a href="/src/people/r/ReaganRonald/">Ronald Reagan</a></span>`);
         }
         {
             const peopleWithFullName = createPeopleElement(context, "Jérôme Beau");

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.29",
+  "version": "0.3.31",
   "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.26",
+    "@rr0/data": "^0.3.27",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.3",
     "@rr0/time": "^0.11.0",
@@ -39,11 +39,11 @@
     "glob": "^11.0.1",
     "image-size": "^2.0.1",
     "jsdom": "^26.0.0",
-    "netlify-cli": "^19.0.3",
     "selenium-webdriver": "^4.30.0",
     "ssg-api": "^1.16.15"
   },
   "devDependencies": {
+    "netlify-cli": "^19.1.4",
     "@javarome/testscript": "^0.13.1",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.13.11",