npm - @rr0/cms - Versions diffs - 0.3.42 → 0.3.43 - Mend

@rr0/cms 0.3.42 → 0.3.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/lang/LanguageReplaceCommand.js CHANGED Viewed

@@ -15,17 +15,28 @@ export class LanguageReplaceCommand extends DomReplaceCommand {
                     const langInfo = inputFile.lang;
                     const variants = langInfo.variants;
                     const foundLang = langInfo.lang;
-                    const pageLang = variants.includes("en") ?
-                        foundLang ? foundLang : "fr" : variants.includes("fr") ?
-                        foundLang ? foundLang : "en"
-                        : "fr";
+                    let pageLang;
+                    const hasEnglishVariant = variants.includes("en");
+                    if (hasEnglishVariant) {
+                        pageLang = foundLang ? foundLang : "fr";
+                    }
+                    else {
+                        if (variants.includes("fr")) {
+                            pageLang = foundLang && foundLang !== "fr" ? foundLang : "en";
+                        }
+                        else {
+                            pageLang = "fr";
+                        }
+                    }
                     context.file.document.documentElement.lang = inputFile.lang.lang = pageLang;
                     const langVariants = variants.length == 1 && variants[0] == "" ? [pageLang == "fr" ? "en" : "fr"] : variants;
                     const fileName = inputFile.name;
                     for (let i = 0; i < langVariants.length; i++) {
                         const langVariant = langVariants[i];
                         const altLink = doc.createElement("a");
-                        altLink.href = "/" + fileName.replace((foundLang ? "_" + foundLang : "") + ".", `${variants[i] == "" ? "" : "_" + langVariant}.`);
+                        const toReplace = (foundLang ? "_" + foundLang : "") + ".";
+                        const replacement = `${variants[i] == "" ? "" : "_" + langVariant}.`;
+                        altLink.href = "/" + fileName.replace(toReplace, replacement);
                         const altText = langVariant === "en" ? "English version" : "Version française";
                         altLink.textContent = Buffer.from(altText, "utf-8").toString();
                         original.appendChild(altLink);

package/dist/lang/LanguageReplaceCommand.test.js ADDED Viewed

@@ -0,0 +1,29 @@
+import { LanguageReplaceCommand } from "./LanguageReplaceCommand.js";
+import { rr0TestUtil } from "../test/index.js";
+import { describe, expect, test } from "@javarome/testscript";
+describe("LanguageReplaceCommand", () => {
+    test("add default english translation", async () => {
+        const context = rr0TestUtil.time.newHtmlContext("1/9/6/8/CondonReport/index_fr.html", `<span id="alternate"/>`);
+        const command = new LanguageReplaceCommand();
+        await command.execute(context);
+        expect(context.file.contents).toBe(`<html lang="fr"><head><meta name="generator" content="ssg-api"></head><body><span id="alternate"><a href="/${rr0TestUtil.filePath(rr0TestUtil.time.filePath("1/9/6/8/CondonReport/index.html"))}">English version</a></span></body></html>`);
+    });
+    test("add english translation", async () => {
+        const context = rr0TestUtil.time.newHtmlContext("0/6/4/0/ChronicaMinor/index_fr.html", `<span id="alternate"/>`);
+        const command = new LanguageReplaceCommand();
+        await command.execute(context);
+        expect(context.file.contents).toBe(`<html lang="fr"><head><meta name="generator" content="ssg-api"></head><body><span id="alternate"><a href="/${rr0TestUtil.filePath(rr0TestUtil.time.filePath("0/6/4/0/ChronicaMinor/index_en.html"))}">English version</a></span></body></html>`);
+    });
+    test("add french translation from default", async () => {
+        const context = rr0TestUtil.time.newHtmlContext("1/9/6/8/CondonReport/index.html", `<span id="alternate"/>`);
+        const command = new LanguageReplaceCommand();
+        await command.execute(context);
+        expect(context.file.contents).toBe(`<html lang="en"><head><meta name="generator" content="ssg-api"></head><body><span id="alternate"><a href="/${rr0TestUtil.filePath(rr0TestUtil.time.filePath("1/9/6/8/CondonReport/index_fr.html"))}">Version française</a></span></body></html>`);
+    });
+    test("add french translation", async () => {
+        const context = rr0TestUtil.time.newHtmlContext("0/6/4/0/ChronicaMinor/index_en.html", `<span id="alternate"/>`);
+        const command = new LanguageReplaceCommand();
+        await command.execute(context);
+        expect(context.file.contents).toBe(`<html lang="en"><head><meta name="generator" content="ssg-api"></head><body><span id="alternate"><a href="/${rr0TestUtil.filePath(rr0TestUtil.time.filePath("0/6/4/0/ChronicaMinor/index_fr.html"))}">Version française</a></span></body></html>`);
+    });
+});

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.42",
+  "version": "0.3.43",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
     "circular-deps": "dpdm src",
     "prepublishOnly": "npm run build && npm test",
     "test": "testscript",
-    "test-one": "rm -Rf out && tsx src/CMSGenerator.test.ts",
+    "test-one": "rm -Rf out && tsx src/lang/LanguageReplaceCommand.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
@@ -37,10 +37,10 @@
     "@rr0/time": "^0.11.1",
     "canvas": "^3.1.0",
     "csv-parser": "^3.2.0",
-    "glob": "^11.0.1",
-    "image-size": "^2.0.1",
-    "jsdom": "^26.0.0",
-    "selenium-webdriver": "^4.30.0",
+    "glob": "^11.0.2",
+    "image-size": "^2.0.2",
+    "jsdom": "^26.1.0",
+    "selenium-webdriver": "^4.32.0",
     "ssg-api": "^1.16.15"
   },
   "devDependencies": {

package/dist/lang/LanguageReplaceCommant.test.js DELETED Viewed

@@ -1,17 +0,0 @@
-import { LanguageReplaceCommand } from "./LanguageReplaceCommand.js";
-import { rr0TestUtil } from "../test/index.js";
-import { describe, expect, test } from "@javarome/testscript";
-describe("LanguageReplaceCommand", () => {
-    test("add english translation", { skip: true }, async () => {
-        const context = rr0TestUtil.time.newHtmlContext("1/9/6/8/CondonReport/index_fr.html", `<span id="alternate"/>`);
-        const command = new LanguageReplaceCommand();
-        await command.execute(context);
-        expect(context.file.contents).toBe(`<html lang="fr"><head></head><body><span id="alternate"><a href="${rr0TestUtil.time.filePath("1/9/6/8/CondonReport/index_fr.html")}">English version</a></span></body></html>`);
-    });
-    test("add french translation", { skip: true }, async () => {
-        const context = rr0TestUtil.time.newHtmlContext("1/9/6/8/CondonReport/index.html", `<span id="alternate"/>`);
-        const command = new LanguageReplaceCommand();
-        await command.execute(context);
-        expect(context.file.contents).toBe(`<html lang="en"><head><meta name="generator" content="ssg-api"></head><body><span id="alternate"><a href="${rr0TestUtil.time.filePath("1/9/6/8/CondonReport/index_fr.html")}">Version française</a></span></body></html>`);
-    });
-});

/package/dist/lang/{LanguageReplaceCommant.test.d.ts → LanguageReplaceCommand.test.d.ts} RENAMED Viewed

File without changes