@rr0/cms 0.1.22 → 0.1.24

package/dist/RR0Build.d.ts

@@ -11,7 +11,6 @@ export interface RR0BuildOptions {
     timeOptions: TimeServiceOptions;
     siteBaseUrl: string;
     timeFormat: Intl.DateTimeFormatOptions;
-    timeFiles: string[];
     directoryPages: string[];
     ufoCaseDirectoryFile: string;
     ufoCasesExclusions: string[];

package/dist/RR0Build.js

@@ -6,7 +6,7 @@ import { GooglePlaceService, PlaceReplacerFactory } from "./place/index.js";
 import { OrganizationFactory, OrganizationService } from "./org/index.js";
 import { RR0ContextImpl } from "./RR0Context.js";
 import { HtmlTable } from "./util/index.js";
-import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
+import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiIncludeReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
 import { LanguageReplaceCommand } from "./lang/index.js";
 import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleFactory, PeopleReplacerFactory, PeopleService, WitnessReplacerFactory } from "./people";
 import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source";
@@ -31,7 +31,9 @@ import { writeFile } from "@javarome/fileutil";
 import { AllDataService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 const outputFunc = async (context, outFile) => {
     try {
-        context.file.contents = context.file.serialize();
+        if (context.file instanceof HtmlFileContents) {
+            context.file.contents = context.file.serialize();
+        }
         context.log("Writing", outFile.name);
         await outFile.write();
         context.file.contents = outFile.contents;
@@ -74,7 +76,7 @@ export class RR0Build {
     }
     async run(args) {
         const context = this.context;
-        const timeFiles = this.options.timeFiles;
+        const timeFiles = this.options.timeOptions.files;
         context.setVar("timeFilesCount", timeFiles.length);
         const timeService = this.timeService;
         const timeElementFactory = new TimeElementFactory(timeService.renderer);

package/dist/RR0Build.test.js

@@ -1,17 +1,13 @@
 import { glob } from "glob";
 import { describe } from "@javarome/testscript";
-import { FileContents } from "@javarome/fileutil";
-import { CLI } from "./util/index.js";
 import { RR0Build } from "./RR0Build.js";
 import { testFilePath } from "./test";
 import * as process from "node:process";
 describe("Build", () => {
     console.time("ssg");
-    let args = new CLI().getArgs();
-    const configFile = args.config;
-    if (configFile) {
-        args = JSON.parse(FileContents.read(configFile).contents);
-    }
+    const args = {
+        force: "true"
+    };
     const cliContents = args.contents;
     console.debug("contents", cliContents);
     const mandatoryRoots = ["people/*.html", "science/crypto/ufo/enquete/dossier/*.html"];
@@ -53,10 +49,6 @@ describe("Build", () => {
     if (!googleMapsApiKey) {
         throw Error("GOOGLE_MAPS_API_KEY is required");
     }
-    const timeOptions = {
-        root: testFilePath("time"),
-        files: []
-    };
     const timeFormat = {
         year: "numeric",
         month: "long",
@@ -97,9 +89,13 @@ describe("Build", () => {
         const sourceRegistryFileName = testFilePath("source/index.json");
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
+        const timeOptions = {
+            root: testFilePath("time"),
+            files: timeFiles
+        };
         const build = new RR0Build({
             contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
-            siteBaseUrl, timeFormat, timeFiles, directoryPages,
+            siteBaseUrl, timeFormat, directoryPages,
             ufoCaseDirectoryFile: testFilePath("science/crypto/ufo/enquete/dossier/index.html"),
             ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(testFilePath),
             sourceRegistryFileName,

package/dist/RR0Context.js

@@ -9,6 +9,15 @@ export class RR0ContextImpl extends SsgContextImpl {
         this.messages = messages;
         this.images = new Set();
         this.fileMap = new Map();
+        while (!this.messages) {
+            if (locale.length > 2) {
+                locale = locale.substring(0, 2); // Fallback to language without country specifics
+            }
+            else {
+                locale = "fr"; // Default language
+            }
+            this.messages = ssgMessages[locale];
+        }
     }
     read(filePath) {
         let file = this.fileMap.get(filePath);

package/dist/RR0Context.test.d.ts

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

package/dist/RR0Context.test.js

@@ -0,0 +1,23 @@
+import { describe, expect, test } from "@javarome/testscript";
+import { rr0TestUtil } from "./test";
+import { ssgMessages } from "./lang";
+describe("RROContextImpl", () => {
+    describe("constructor with locale", () => {
+        test("default locale", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "");
+            expect(context.locale).toBe("fr");
+        });
+        test("supported locale", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "", "en");
+            expect(context.locale).toBe("en");
+        });
+        test("locale fallback to lang only", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "", "en-US");
+            expect(context.messages).toEqual(ssgMessages["en"]);
+        });
+        test("locale fallback to default", () => {
+            const context = rr0TestUtil.time.newHtmlContext("test.html", "", "xx");
+            expect(context.messages).toEqual(ssgMessages["fr"]);
+        });
+    });
+});

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.1.22",
+  "version": "0.1.24",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,14 +23,14 @@
     "build": "rm -Rf dist && tsc --project tsconfig.prod.json",
     "prepublishOnly": "npm run build",
     "test": "testscript",
-    "test-one": "rm -Rf out && tsx src/RR0Build.test.ts",
+    "test-one": "rm -Rf out && tsx src/RR0Context.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
     "@googlemaps/google-maps-services-js": "^3.4.0",
     "@rr0/common": "^1.1.3",
     "@rr0/lang": "^0.1.12",
-    "@rr0/time": "^0.8.4",
+    "@rr0/time": "^0.8.5",
     "@rr0/place": "^0.3.2",
     "@rr0/data": "^0.1.2",
     "@javarome/fileutil": "^0.3.6",