@rr0/cms 0.1.19 → 0.1.21

package/dist/RR0Build.d.ts

@@ -1,9 +1,28 @@
 import { TimeServiceOptions } from "./time";
 import { FileWriteConfig } from "ssg-api";
 import { PeopleDirectoryStepOptions } from "./people";
+export interface RR0BuildOptions {
+    contentRoots: string[];
+    copies: string[];
+    outDir: string;
+    locale: string;
+    googleMapsApiKey: string;
+    mail: string;
+    timeOptions: TimeServiceOptions;
+    siteBaseUrl: string;
+    timeFormat: Intl.DateTimeFormatOptions;
+    timeFiles: string[];
+    directoryPages: string[];
+    ufoCaseDirectoryFile: string;
+    ufoCasesExclusions: string[];
+    sourceRegistryFileName: string;
+    directoryExcluded: string[];
+    directoryOptions: PeopleDirectoryStepOptions;
+    inDir?: (path: string) => string;
+}
 export interface RR0BuildArgs {
     /**
-     * Configuration file
+     * Configuration file name.
      */
     config?: string;
     /**
@@ -29,19 +48,7 @@ export interface RR0BuildArgs {
     force?: string;
 }
 export declare class RR0Build {
-    protected contentRoots: string[];
-    protected copies: string[];
-    protected outDir: string;
-    protected timeOptions: TimeServiceOptions;
-    protected siteBaseUrl: string;
-    protected timeFormat: Intl.DateTimeFormatOptions;
-    protected timeFiles: string[];
-    protected directoryPages: string[];
-    protected ufoCaseDirectoryFile: string;
-    protected ufoCasesExclusions: string[];
-    protected sourceRegistryFileName: string;
-    protected directoryExcluded: string[];
-    protected directoryOptions: PeopleDirectoryStepOptions;
+    protected options: RR0BuildOptions;
     config: FileWriteConfig;
     private context;
     private placeService;
@@ -51,6 +58,6 @@ export declare class RR0Build {
     private dataService;
     private peopleFactory;
     private timeTextBuilder;
-    constructor(contentRoots: string[], copies: string[], outDir: string, locale: string, googleMapsApiKey: string, mail: string, timeOptions: TimeServiceOptions, siteBaseUrl: string, timeFormat: Intl.DateTimeFormatOptions, timeFiles: string[], directoryPages: string[], ufoCaseDirectoryFile: string, ufoCasesExclusions: string[], sourceRegistryFileName: string, directoryExcluded: string[], directoryOptions: PeopleDirectoryStepOptions);
+    constructor(options: RR0BuildOptions);
     run(args: RR0BuildArgs): Promise<void>;
 }

package/dist/RR0Build.js

@@ -41,33 +41,23 @@ const outputFunc = async (context, outFile) => {
     }
 };
 export class RR0Build {
-    constructor(contentRoots, copies, outDir, locale, googleMapsApiKey, mail, timeOptions, siteBaseUrl, timeFormat, timeFiles, directoryPages, ufoCaseDirectoryFile, ufoCasesExclusions, sourceRegistryFileName, directoryExcluded, directoryOptions) {
-        this.contentRoots = contentRoots;
-        this.copies = copies;
-        this.outDir = outDir;
-        this.timeOptions = timeOptions;
-        this.siteBaseUrl = siteBaseUrl;
-        this.timeFormat = timeFormat;
-        this.timeFiles = timeFiles;
-        this.directoryPages = directoryPages;
-        this.ufoCaseDirectoryFile = ufoCaseDirectoryFile;
-        this.ufoCasesExclusions = ufoCasesExclusions;
-        this.sourceRegistryFileName = sourceRegistryFileName;
-        this.directoryExcluded = directoryExcluded;
-        this.directoryOptions = directoryOptions;
+    constructor(options) {
+        this.options = options;
         this.config = {
             getOutputPath(context) {
-                return path.join(outDir, context.file.name);
+                return path.join(options.outDir, context.file.name);
             }
         };
         const timeContext = new TimeContext();
-        const context = this.context = new RR0ContextImpl(locale, timeContext, this.config);
-        context.setVar("mapsApiKey", googleMapsApiKey);
-        context.setVar("mail", mail);
-        this.placeService = new GooglePlaceService("place", googleMapsApiKey);
+        const context = this.context = new RR0ContextImpl(options.locale, timeContext, this.config);
+        context.setVar("mapsApiKey", options.googleMapsApiKey);
+        context.setVar("mail", options.mail);
+        this.placeService = new GooglePlaceService("place", options.googleMapsApiKey);
         this.orgService = new OrganizationService([], "org", undefined);
-        const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(timeFormat);
-        const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeOptions.root });
+        const timeTextBuilder = this.timeTextBuilder = new TimeTextBuilder(options.timeFormat);
+        const timeOptions = options.timeOptions;
+        const timeRoot = this.options.inDir(timeOptions.root);
+        const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeRoot });
         const eventFactory = new RR0EventFactory();
         const sightingFactory = new TypedDataFactory(eventFactory, "sighting", ["index"]);
         const orgFactory = new OrganizationFactory(eventFactory);
@@ -84,7 +74,7 @@ export class RR0Build {
     }
     async run(args) {
         const context = this.context;
-        const timeFiles = this.timeFiles;
+        const timeFiles = this.options.timeFiles;
         context.setVar("timeFilesCount", timeFiles.length);
         const timeService = this.timeService;
         const timeElementFactory = new TimeElementFactory(timeService.renderer);
@@ -99,13 +89,19 @@ export class RR0Build {
         const bookMeta = new Map();
         const bookLinks = new Map();
         const config = this.config;
-        const ufoCasesStep = new CaseDirectoryStep(caseService, caseService.files, this.ufoCasesExclusions, this.ufoCaseDirectoryFile, outputFunc, config);
-        const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, config, peopleService, this.directoryExcluded);
-        const peopleSteps = await peopleDirectoryFactory.create(this.directoryOptions);
+        const ufoCaseDirectoryFile = this.options.inDir(this.options.ufoCaseDirectoryFile);
+        const ufoCasesExclusions = this.options.ufoCasesExclusions.map(this.options.inDir);
+        const ufoCasesStep = new CaseDirectoryStep(caseService, caseService.files, ufoCasesExclusions, ufoCaseDirectoryFile, outputFunc, config);
+        const peopleDirectoryFactory = new PeopleDirectoryStepFactory(outputFunc, config, peopleService, this.options.directoryExcluded);
+        const directoryOptions = this.options.directoryOptions;
+        for (const directoryOption in directoryOptions) {
+            directoryOptions[directoryOption] = this.options.inDir(directoryOptions[directoryOption]);
+        }
+        const peopleSteps = await peopleDirectoryFactory.create(directoryOptions);
         // Publish case.json files so that vraiufo.com will find them
-        const copies = this.copies;
+        const copies = this.options.copies;
         copies.push(...(ufoCasesStep.config.rootDirs).map(dir => path.join(dir, "case.json")));
-        const outDir = this.outDir;
+        const outDir = this.options.outDir;
         await writeFile(path.join(outDir, "casesDirs.json"), JSON.stringify(ufoCasesStep.config.rootDirs), "utf-8");
         copies.push(...(peopleSteps.reduce((rootDirs, peopleStep) => {
             rootDirs.push(...peopleStep.config.rootDirs);
@@ -116,9 +112,10 @@ export class RR0Build {
         const searchVisitor = new SearchVisitor({ notIndexedUrls: ["404.html", "Referencement.html"], indexWords: false }, timeTextBuilder);
         const sourceRenderer = new SourceRenderer(timeTextBuilder);
         const http = new HttpSource();
-        const baseUrl = this.siteBaseUrl;
-        const timeFormat = this.timeFormat;
-        const sourceFactory = new PersistentSourceRegistry(dataService, http, baseUrl, this.sourceRegistryFileName, timeFormat);
+        const baseUrl = this.options.siteBaseUrl;
+        const timeFormat = this.options.timeFormat;
+        const sourceRegistryFileName = this.options.inDir(this.options.sourceRegistryFileName);
+        const sourceFactory = new PersistentSourceRegistry(dataService, http, baseUrl, sourceRegistryFileName, timeFormat);
         const noteCounter = new NoteFileCounter();
         const noteRenderer = new NoteRenderer(noteCounter);
         const caseRenderer = new CaseSummaryRenderer(noteRenderer, sourceFactory, sourceRenderer, timeElementFactory);
@@ -171,7 +168,7 @@ export class RR0Build {
         const ssg = new Ssg(config);
         const getOutputPath = (context) => path.join(outDir, context.file.name);
         const force = args.force === "true";
-        const toProcess = new Set(this.directoryPages);
+        const toProcess = new Set(this.options.directoryPages);
         const csvTransformer = new class {
             transform(context, file) {
                 const fileName = file.name;
@@ -191,10 +188,17 @@ export class RR0Build {
                 return path.join(outDir, "netlify.toml");
             }
         };
-        const contentRoots = this.contentRoots;
+        const options = this.options;
+        const contentRoots = options.contentRoots.map(options.inDir);
         const includeStep = new RR0ContentStep([htAccessToNetlifyConfig, {
                 roots: contentRoots,
-                replacements: [new SsiIncludeReplaceCommand([csvTransformer])],
+                replacements: [new class extends SsiIncludeReplaceCommand {
+                        filePath(context, fileNameArg) {
+                            const dirName = path.dirname(context.file.name);
+                            return fileNameArg.startsWith("/") ?
+                                path.join(process.cwd(), options.inDir(fileNameArg)) : path.join(dirName, fileNameArg);
+                        }
+                    }([csvTransformer])],
                 getOutputPath
             }], outputFunc, [], [], force, "content includes", toProcess);
         ssg.add(includeStep);
@@ -224,13 +228,13 @@ export class RR0Build {
             ssg.add(new SearchIndexStep("search/index.json", searchVisitor));
         }
         if (reindex === null || reindex === void 0 ? void 0 : reindex.includes("sources")) {
-            ssg.add(new SourceIndexStep(this.sourceRegistryFileName, sourceFactory));
+            ssg.add(new SourceIndexStep(sourceRegistryFileName, sourceFactory));
         }
         if (copies) {
             const copyConfig = {
                 getOutputPath,
-                sourcePatterns: copies,
-                options: { ignore: ["node_modules/**", "out/**"] }
+                sourcePatterns: copies.map(this.options.inDir),
+                options: { ignore: ["node_modules/**", "out/**"].map(this.options.inDir) }
             };
             ssg.add(new CopyStep(copyConfig));
         }

package/dist/RR0Build.test.js

@@ -1,13 +1,10 @@
-import path from "path";
 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 { rr0TestUtil } from "./test";
-function testFilePath(filePath) {
-    return path.join(rr0TestUtil.rootDir, filePath);
-}
+import { testFilePath } from "./test";
+import * as process from "node:process";
 describe("Build", () => {
     console.time("ssg");
     let args = new CLI().getArgs();
@@ -50,14 +47,14 @@ describe("Build", () => {
         "time/DualRangeComponent.mjs",
         "index/index.js", "lang/form.js", "lang/form.css", "lang/speech.js", "lang/speech.css",
         "croyance/divin/theisme/mono/livre/islam/coran/index.js"
-    ].map(testFilePath);
+    ];
     const outDir = "out";
     const googleMapsApiKey = process.env.GOOGLE_MAPS_API_KEY;
     if (!googleMapsApiKey) {
         throw Error("GOOGLE_MAPS_API_KEY is required");
     }
     const timeOptions = {
-        root: testFilePath("time"),
+        root: "time",
         files: []
     };
     const timeFormat = {
@@ -85,22 +82,31 @@ describe("Build", () => {
     ].map(testFilePath);
     getTimeFiles().then(async (timeFiles) => {
         const directoryOptions = {
-            root: testFilePath("people/index.html"),
-            scientists: testFilePath("people/scientifiques.html"),
-            ufologists: testFilePath("people/ufologues.html"),
-            ufoWitnesses: testFilePath("people/witness/index.html"),
-            astronomers: testFilePath("people/astronomes.html"),
-            contactees: testFilePath("people/contactes.html"),
-            pilots: testFilePath("people/pilotes.html"),
-            military: testFilePath("people/militaires.html"),
-            softwareEngineers: testFilePath("tech/info/Personnes.html"),
-            politicians: testFilePath("people/politicians.html"),
-            rulers: testFilePath("people/dirigeants.html")
+            root: "people/index.html",
+            scientists: "people/scientifiques.html",
+            ufologists: "people/ufologues.html",
+            ufoWitnesses: "people/witness/index.html",
+            astronomers: "people/astronomes.html",
+            contactees: "people/contactes.html",
+            pilots: "people/pilotes.html",
+            military: "people/militaires.html",
+            softwareEngineers: "tech/info/Personnes.html",
+            politicians: "people/politicians.html",
+            rulers: "people/dirigeants.html"
         };
-        const sourceRegistryFileName = testFilePath("source/index.json");
+        const sourceRegistryFileName = "source/index.json";
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
-        const build = new RR0Build(contentRoots, copies, outDir, "fr", googleMapsApiKey, mail, timeOptions, siteBaseUrl, timeFormat, timeFiles, directoryPages, testFilePath("science/crypto/ufo/enquete/dossier/index.html"), [testFilePath("science/crypto/ufo/enquete/dossier/canular")], sourceRegistryFileName, ["people/Astronomers_fichiers", "people/witness", "people/author"], directoryOptions);
+        const build = new RR0Build({
+            contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
+            siteBaseUrl, timeFormat, timeFiles, directoryPages,
+            ufoCaseDirectoryFile: "science/crypto/ufo/enquete/dossier/index.html",
+            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"],
+            sourceRegistryFileName,
+            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"],
+            directoryOptions,
+            inDir: testFilePath
+        });
         await build.run(args);
     });
 });

package/dist/book/BookService.test.d.ts

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

package/dist/book/BookService.test.js

@@ -0,0 +1,32 @@
+import { ConsoleLogger } from "ssg-api";
+import { CLI } from "../util/cli/CLI.js";
+import path from "path";
+import { PeopleFactory, PeopleService } from "../people";
+import { AllDataService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { BookService } from "./BookService";
+import { TimeUrlBuilder } from "../time";
+import { testFilePath } from "../test";
+const logger = new ConsoleLogger("rr0-books");
+const args = new CLI().getArgs();
+const fileName = args.import;
+const dry = args.dry === "true";
+const peopleFactory = new PeopleFactory(new RR0EventFactory());
+const eventFactory = new RR0EventFactory();
+const bookFactory = new TypedDataFactory(eventFactory, "book");
+const dataService = new AllDataService([bookFactory, peopleFactory]);
+const outDir = "out";
+const config = {
+    getOutputPath(context) {
+        return path.join(outDir, context.file.name);
+    }
+};
+const timeOptions = {
+    root: testFilePath("time"),
+    files: []
+};
+const timeUrlBuilder = new TimeUrlBuilder({ rootDir: timeOptions.root });
+let files = [];
+const books = new BookService(logger, dry, new PeopleService(dataService, peopleFactory, files), timeUrlBuilder, config);
+books.import(fileName).then((result) => {
+    logger.log("Wrote", result.length, "books");
+});

package/dist/test/RR0TestUtil.d.ts

@@ -19,3 +19,4 @@ export declare class RR0TestUtil {
     newHtmlContext(inputFileName: string, contents?: string, locale?: string): HtmlRR0Context;
 }
 export declare const rr0TestUtil: RR0TestUtil;
+export declare function testFilePath(filePath: string): string;

package/dist/test/RR0TestUtil.js

@@ -65,8 +65,12 @@ export class RR0TestUtil {
         const lang = currentFile.lang;
         context.file = new HtmlFileContents(currentFile.name, currentFile.encoding, currentFile.contents, currentFile.lastModified, lang, { author: [] }, {}, title);
         const htmlContext = context;
-        Object.assign(htmlContext.time, Time.contextFromFileName(htmlContext, inputFileName));
+        const timeContext = Time.contextFromFileName(htmlContext, inputFileName);
+        Object.assign(htmlContext.time, timeContext);
         return htmlContext;
     }
 }
 export const rr0TestUtil = new RR0TestUtil();
+export function testFilePath(filePath) {
+    return path.join(rr0TestUtil.rootDir, filePath);
+}

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.19",
+  "version": "0.1.21",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
     "build": "rm -Rf dist && tsc --project tsconfig.prod.json",
     "prepublishOnly": "npm run build",
     "test": "testscript",
-    "test-one": "rm -Rf out && tsx src/time/datasource/JsonMapper.test.ts",
+    "test-one": "rm -Rf out && tsx src/RR0Build.test.ts",
     "test-ci": "rm -Rf out && testscript"
   },
   "dependencies": {
@@ -34,7 +34,7 @@
     "@rr0/place": "^0.3.2",
     "@rr0/data": "^0.1.2",
     "@javarome/fileutil": "^0.3.6",
-    "ssg-api": "^1.16.10",
+    "ssg-api": "^1.16.11",
     "canvas": "^2.11.2",
     "csv-parser": "^3.0.0",
     "glob": "^11.0.0",