@rr0/cms 0.3.21 → 0.3.23

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/people/a/Aristote/*.html"],
         force: "true"
     };
     const cliContents = args.contents;

package/dist/DataContentVisitor.d.ts

@@ -13,6 +13,7 @@ export declare class DataContentVisitor implements ContentVisitor {
     constructor(service: AllDataService, eventRenderer: EventRenderer<RR0Event>, timeElementFactory: TimeElementFactory);
     visit(context: HtmlRR0Context): Promise<void>;
     protected process(context: HtmlRR0Context, data: RR0Data): Promise<void>;
+    protected processEvent(context: HtmlRR0Context, event: RR0Event, data: RR0Data): Promise<void>;
     protected timeParagraph(context: HtmlRR0Context, event: RR0Event): {
         eventP: HTMLParagraphElement;
         timeEl: HTMLElement;

package/dist/DataContentVisitor.js

@@ -27,29 +27,31 @@ export class DataContentVisitor {
         this.processTitle(context, data);
         this.processURL(context, data);
         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.eventType) {
-                case "birth":
-                    await this.processBirth(context, event, data);
-                    break;
-                case "book":
-                    await this.processBook(context, event);
-                    break;
-                case "image":
-                    await this.processImage(context, event);
-                    break;
-                case "death":
-                    await this.processDeath(context, event, data);
-                    break;
-                default:
-                    const { eventP, timeEl } = this.timeParagraph(context, event);
-                    await this.eventRenderer.render(context, event, eventP);
-                    doc.append(eventP);
-            }
+            await this.processEvent(context, event, data);
         }
         context.file.contents = context.file.serialize();
     }
+    async processEvent(context, event, data) {
+        switch (event.eventType) {
+            case "birth":
+                await this.processBirth(context, event, data);
+                break;
+            case "book":
+                await this.processBook(context, event);
+                break;
+            case "image":
+                await this.processImage(context, event);
+                break;
+            case "death":
+                await this.processDeath(context, event, data);
+                break;
+            default:
+                const { eventP, timeEl } = this.timeParagraph(context, event);
+                await this.eventRenderer.render(context, event, eventP);
+                context.file.document.append(eventP);
+        }
+    }
     timeParagraph(context, event) {
         const container = context.file.document.createElement("p");
         const eventContext = context.clone();

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

@@ -6,7 +6,7 @@ export class CaseFactory extends TypedDataFactory {
         const parsedCase = super.parse(dataJson);
         const time = dataJson.time;
         if (time) {
-            parsedCase.time = EdtfDate.fromString(time);
+            Object.assign(parsedCase, { time: EdtfDate.fromString(time) });
         }
         const placeName = dataJson.place;
         if (placeName) {

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

@@ -21,7 +21,7 @@ export class CaseService extends AbstractDataService {
         if (time) {
             caseContext.time = new TimeContext((_a = time.year) === null || _a === void 0 ? void 0 : _a.value, (_b = time.month) === null || _b === void 0 ? void 0 : _b.value, (_c = time.day) === null || _c === void 0 ? void 0 : _c.value, (_d = time.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = time.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = time.timeshift) === null || _f === void 0 ? void 0 : _f.toString());
             const options = { year: "numeric" };
-            const { result, replacement } = this.timeElementFactory.renderer.renderContent(caseContext, undefined, { url: true, contentOnly: false }, options);
+            const { result, replacement } = this.timeElementFactory.renderer.renderContent(caseContext, undefined, { url: false, contentOnly: false }, options);
             result.append(replacement);
             details.push(result.outerHTML);
         }

package/dist/time/SsiTitleReplaceCommand.js

@@ -14,9 +14,10 @@ export class SsiTitleReplaceCommand extends SsiEchoVarReplaceCommand {
     async createReplacer(context) {
         return {
             replace: (_match, ..._args) => {
-                context.file.title = this.getTitle(context);
+                const titleStr = this.getTitle(context);
+                context.file.title = titleStr;
                 const titleUrl = context.file.meta.url;
-                return titleUrl ? `<a href="${titleUrl}" target="_blank">${(this.getTitle(context))}</a>` : this.getTitle(context);
+                return titleUrl ? `<a href="${titleUrl}" target="_blank">${titleStr}</a>` : titleStr;
             }
         };
     }

package/dist/time/TimeService.js

@@ -57,6 +57,9 @@ export class TimeService extends AbstractDataService {
             time.setDayOfMonth(newTimeContext.getDayOfMonth());
             // context.time.from = context.time
         }
+        // TODO: Set people + parent context if filePath under people root dir
+        // TODO: Set place + parent context if filePath under place root dir
+        // TODO: Set place + parent context if filePath under org root dir
         return newTimeContext;
     }
 }

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.21",
+  "version": "0.3.23",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,15 +30,16 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.7",
     "@rr0/common": "^1.1.3",
-    "@rr0/data": "^0.3.23",
+    "@rr0/data": "^0.3.25",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.3",
     "@rr0/time": "^0.11.0",
     "canvas": "^3.1.0",
     "csv-parser": "^3.2.0",
     "glob": "^11.0.1",
-    "image-size": "^2.0.0",
+    "image-size": "^2.0.1",
     "jsdom": "^26.0.0",
+    "netlify-cli": "^19.0.2",
     "selenium-webdriver": "^4.29.0",
     "ssg-api": "^1.16.15"
   },