@rr0/cms 0.3.64 → 0.3.65

package/dist/people/PeopleDirectoryStep.d.ts

@@ -14,6 +14,11 @@ export declare class PeopleDirectoryStep extends DirectoryStep {
     protected filter: PeopleFilter;
     constructor(name: string, rootDirs: string[], excludedDirs: string[], templateFileName: string, outputFunc: OutputFunc, config: FileWriteConfig, service: PeopleService, renderer: PeopleHtmlRenderer, filter?: PeopleFilter);
     protected processDirs(context: HtmlRR0Context, dirNames: string[]): Promise<void>;
+    /**
+     * An extra directory entry for another name the same people is known by (a pseudonym, a surname), pointing at that
+     * same people's page.
+     */
+    protected alsoKnownAs(people: People, name: string): People;
     protected toList(context: HtmlRR0Context, peopleList: People[], pseudoPeopleList: People[], allCountries: Set<CountryCode>, occupations: Set<Occupation>): HTMLUListElement;
     protected toListItem(context: HtmlRR0Context, people: People, pseudoPeopleList: People[], allCountries: Set<CountryCode>, occupations: Set<Occupation>): HTMLLIElement;
 }

package/dist/people/PeopleDirectoryStep.js

@@ -24,17 +24,21 @@ export class PeopleDirectoryStep extends DirectoryStep {
         const outputPath = config.getOutputPath(context);
         const output = context.newOutput(outputPath);
         const pseudoPeopleList = peopleList.reduce((prevPeopleList, peopleInfo) => {
-            var _a;
-            if (((_a = peopleInfo.pseudonyms) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                for (const pseudonym of peopleInfo.pseudonyms) {
-                    const pseudo = new People(peopleInfo.firstNames, peopleInfo.lastName, peopleInfo.pseudonyms, peopleInfo.occupations, peopleInfo.countries, peopleInfo.discredited, peopleInfo.gender, peopleInfo.id, peopleInfo.dirName, peopleInfo.image);
-                    pseudo.lastAndFirstName = pseudonym;
-                    prevPeopleList.push(pseudo);
+            for (const pseudonym of peopleInfo.pseudonyms || []) {
+                prevPeopleList.push(this.alsoKnownAs(peopleInfo, pseudonym));
+            }
+            return prevPeopleList;
+        }, []);
+        const surnamePeopleList = peopleList.reduce((prevPeopleList, peopleInfo) => {
+            const lastName = peopleInfo.lastName;
+            if (lastName) { // A surname alone would say nothing about who it belongs to
+                for (const surname of peopleInfo.surnames) {
+                    prevPeopleList.push(this.alsoKnownAs(peopleInfo, `${surname} ${lastName}`));
                 }
             }
             return prevPeopleList;
         }, []);
-        peopleList = peopleList.concat(pseudoPeopleList).sort((p1, p2) => p1.lastAndFirstName.localeCompare(p2.lastAndFirstName));
+        peopleList = peopleList.concat(pseudoPeopleList, surnamePeopleList).sort((p1, p2) => p1.lastAndFirstName.localeCompare(p2.lastAndFirstName));
         const allCountries = new Set();
         const occupations = new Set();
         const ul = this.toList(context, peopleList, pseudoPeopleList, allCountries, occupations);
@@ -63,6 +67,15 @@ export class PeopleDirectoryStep extends DirectoryStep {
         }
         await this.outputFunc(context, output);
     }
+    /**
+     * An extra directory entry for another name the same people is known by (a pseudonym, a surname), pointing at that
+     * same people's page.
+     */
+    alsoKnownAs(people, name) {
+        const alias = new People(people.firstNames, people.lastName, people.pseudonyms, people.occupations, people.countries, people.discredited, people.gender, people.id, people.dirName, people.image);
+        alias.lastAndFirstName = name; // Which is both what the entry displays and where it sorts
+        return alias;
+    }
     toList(context, peopleList, pseudoPeopleList, allCountries, occupations) {
         const file = context.file;
         const listItems = peopleList.map(people => this.toListItem(context, people, pseudoPeopleList, allCountries, occupations));

package/dist/people/PeopleHtmlRenderer.js

@@ -10,7 +10,7 @@ export class PeopleHtmlRenderer {
         const classList = ["data-resolved", "people-resolved"];
         if (pseudoPeopleList.indexOf(people) >= 0 || people.pseudonyms.includes(content)) {
             classList.push("pseudonym");
-            titles.push(`(pseudonyme de ${people.firstAndLastName})`);
+            titles.push(`(pseudonyme de ${people.titleOverride || people.firstAndLastName})`);
         }
         if (people.hoax) {
             classList.push("canular");
@@ -52,7 +52,7 @@ export class PeopleHtmlRenderer {
                 titles.push(occupationMsg(gender));
             }
         }
-        const text = content || people.lastAndFirstName || people.title;
+        const text = content || people.titleOverride || people.lastAndFirstName || people.title;
         const doc = context.file.document;
         const link = doc.createElement("a");
         link.innerHTML = text;

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.64",
+  "version": "0.3.65",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.7",
     "@rr0/common": "^1.1.5",
-    "@rr0/data": "^0.3.41",
+    "@rr0/data": "^0.3.43",
     "@rr0/lang": "^0.1.13",
     "@rr0/place": "^0.5.4",
     "@rr0/time": "^0.11.2",