@rr0/cms 0.3.17 → 0.3.19

package/dist/CMSContext.d.ts

@@ -1,5 +1,5 @@
-import { CityService, DepartmentService } from "./org";
-import { CountryService } from "./org/country/CountryService";
+import { CityService, DepartmentService } from "./org/index.js";
+import { CountryService } from "./org/country/CountryService.js";
 export interface CMSContext {
     cityService: CityService;
     departmentService: DepartmentService;

package/dist/CMSGenerator.d.ts

@@ -1,17 +1,16 @@
-import { HttpSource, RR0CaseMapping, TimeElementFactory, TimeRenderer, TimeReplacer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
-import { CaseFactory } from "./science/index.js";
+import { HttpSource, RR0CaseMapping, TimeElementFactory, TimeRenderer, TimeReplacer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time/index.js";
+import { CaseFactory } from "./science/crypto/ufo/enquete/dossier/index.js";
 import { CityService, DepartmentService, OrganizationService } from "./org/index.js";
 import { HtmlRR0Context, RR0ContextImpl } from "./RR0Context.js";
-import { FileWriteConfig } from "ssg-api";
-import { PeopleDirectoryStepOptions } from "./people";
-import { PersistentSourceRegistry, SourceRenderer, SourceReplacerFactory } from "./source";
+import { FileWriteConfig, ReplaceCommand } from "ssg-api";
+import { PeopleDirectoryStepOptions } from "./people/index.js";
+import { PersistentSourceRegistry, SourceRenderer, SourceReplacerFactory } from "./source/index.js";
 import { AllDataService, PeopleFactory, PeopleService } from "@rr0/data";
 import { GooglePlaceService } from "@rr0/place";
-import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer";
-import { CountryService } from "./org/country/CountryService";
-import { CMSContext } from "./CMSContext";
-import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace";
-import { TimeOptions } from "./time/TimeOptions";
+import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer.js";
+import { CountryService } from "./org/country/CountryService.js";
+import { CMSContext } from "./CMSContext.js";
+import { TimeOptions } from "./time/TimeOptions.js";
 export interface CMSGeneratorOptions {
     contentRoots: string[];
     copies: string[];
@@ -89,7 +88,7 @@ export declare class CMSGenerator implements CMSContext {
     };
     protected peopleSetup(context: RR0ContextImpl, peopleRenderer: PeopleHtmlRenderer, copies: string[]): Promise<{
         peopleService: PeopleService;
-        peopleSteps: import("./people").PeopleDirectoryStep[];
+        peopleSteps: import("./people/PeopleDirectoryStep.js").PeopleDirectoryStep[];
         copies: string[];
     }>;
     private setupNotes;

package/dist/CMSGenerator.js

@@ -1,13 +1,13 @@
 import path from "path";
 import fs from "fs";
-import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeRenderer, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time";
-import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/index.js";
+import { CaseSummaryRenderer, ChronologyReplacerFactory, CsvMapper, EventReplacer, EventReplacerFactory, HttpSource, SsiTitleReplaceCommand, TimeElementFactory, TimeLinkDefaultHandler, TimeRenderer, TimeReplacer, TimeReplacerFactory, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time/index.js";
+import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/crypto/ufo/enquete/dossier/index.js";
 import { cities, CityService, CmsOrganizationFactory, countries, departments, DepartmentService, OrganizationService, regions, RegionService } from "./org/index.js";
 import { RR0ContextImpl } from "./RR0Context.js";
 import { HtmlTable } from "./util/index.js";
 import { ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiIncludeReplaceCommand } from "ssg-api";
-import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleReplacerFactory } from "./people";
-import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source";
+import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleReplacerFactory } from "./people/index.js";
+import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source/index.js";
 import { NoteFileCounter, NoteRenderer, NoteReplacer, NoteReplacerFactory } from "./note/index.js";
 import { AnchorReplaceCommand, CaseAnchorHandler, DataAnchorHandler } from "./anchor/index.js";
 import { MetaLinkReplaceCommand } from "./MetaLinkReplaceCommand.js";
@@ -23,8 +23,8 @@ import { TimeContext } from "@rr0/time";
 import { writeFile } from "@javarome/fileutil";
 import { AllDataService, EventDataFactory, PeopleFactory, PeopleService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { GooglePlaceService } from "@rr0/place";
-import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer";
-import { CountryService } from "./org/country/CountryService";
+import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer.js";
+import { CountryService } from "./org/country/CountryService.js";
 const outputFunc = async (context, outFile) => {
     try {
         if (context.file instanceof HtmlFileContents) {

package/dist/CMSGenerator.test.js

@@ -3,25 +3,25 @@ import { describe } from "@javarome/testscript";
 import { CMSGenerator } from "./CMSGenerator.js";
 import { BaseOvniFranceRR0Mapping, FuforaRR0Mapping, NuforcRR0Mapping, RR0Mapping, SceauRR0Mapping, UrecatRR0Mapping } from "./time/index.js";
 import { WitnessReplacerFactory } from "./people/index.js";
-import { testFilePath } from "./test";
 import * as process from "node:process";
-import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping";
-import { BaseReplaceCommand } from "./BaseReplaceCommand";
-import { LanguageReplaceCommand } from "./lang";
+import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.js";
+import { BaseReplaceCommand } from "./BaseReplaceCommand.js";
+import { LanguageReplaceCommand } from "./lang/LanguageReplaceCommand.js";
 import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, DomReplaceCommand, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
-import { rr0DefaultCopyright } from "./RR0DefaultCopyright";
-import { DescriptionReplaceCommand } from "./DescriptionReplaceCommand";
-import { CodeReplacerFactory } from "./tech";
-import { PlaceReplacerFactory } from "./place";
-import { IndexedReplacerFactory, UnitReplaceCommand } from "./index";
+import { rr0DefaultCopyright } from "./RR0DefaultCopyright.js";
+import { DescriptionReplaceCommand } from "./DescriptionReplaceCommand.js";
+import { CodeReplacerFactory } from "./tech/index.js";
+import { PlaceReplacerFactory } from "./place/index.js";
+import { IndexedReplacerFactory, UnitReplaceCommand } from "./index.js";
+import { rr0TestUtil } from "./test/index.js";
 export async function getTimeFiles() {
-    const minusYearFiles = await glob(testFilePath("time/-?/?/?/?/index.html"));
-    const year1Files = await glob(testFilePath("time/?/index.html"));
-    const year2Files = await glob(testFilePath("time/?/?/index.html"));
-    const year3Files = await glob(testFilePath("time/?/?/?/index.html"));
-    const year4Files = await glob(testFilePath("time/?/?/?/?/index.html"));
-    const monthFiles = await glob(testFilePath("time/?/?/?/?/??/index.html"));
-    const dayFiles = await glob(testFilePath("time/?/?/?/?/??/??/index.html"));
+    const minusYearFiles = await glob(rr0TestUtil.filePath("time/-?/?/?/?/index.html"));
+    const year1Files = await glob(rr0TestUtil.filePath("time/?/index.html"));
+    const year2Files = await glob(rr0TestUtil.filePath("time/?/?/index.html"));
+    const year3Files = await glob(rr0TestUtil.filePath("time/?/?/?/index.html"));
+    const year4Files = await glob(rr0TestUtil.filePath("time/?/?/?/?/index.html"));
+    const monthFiles = await glob(rr0TestUtil.filePath("time/?/?/?/?/??/index.html"));
+    const dayFiles = await glob(rr0TestUtil.filePath("time/?/?/?/?/??/??/index.html"));
     return year1Files.concat(year2Files).concat(year3Files).concat(year4Files).concat(minusYearFiles).concat(monthFiles).concat(dayFiles).sort();
 }
 describe("Build", () => {
@@ -49,7 +49,7 @@ describe("Build", () => {
             "tech/**/*.html",
             "udb/*.html",
             "js/**/*.html"
-        ].map(testFilePath);
+        ].map(rr0TestUtil.filePath);
     const copiesArg = args.copies;
     const copies = copiesArg ? copiesArg : [
         "favicon.ico", "manifest.json", "opensearch.xml", "apple-touch-icon.png", "apple-touch-icon_400x400.png", "screenshot1.jpg",
@@ -65,7 +65,7 @@ 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);
+    ].map(path => rr0TestUtil.filePath(path));
     const outDir = "out";
     const googleMapsApiKey = process.env.GOOGLE_MAPS_API_KEY;
     if (!googleMapsApiKey) {
@@ -83,25 +83,25 @@ describe("Build", () => {
         "people/index.html", "people/witness/index.html", "people/militaires.html", "people/scientifiques.html",
         "people/astronomes.html", "people/politicians.html", "people/dirigeants.html", "people/pilotes.html",
         "people/contactes.html", "people/ufologues.html", "tech/info/Personnes.html", "people/Contributeurs.html"
-    ].map(testFilePath);
+    ].map(path => rr0TestUtil.filePath(path));
     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: rr0TestUtil.filePath("people/index.html"),
+            scientists: rr0TestUtil.filePath("people/scientifiques.html"),
+            ufologists: rr0TestUtil.filePath("people/ufologues.html"),
+            ufoWitnesses: rr0TestUtil.filePath("people/witness/index.html"),
+            astronomers: rr0TestUtil.filePath("people/astronomes.html"),
+            contactees: rr0TestUtil.filePath("people/contactes.html"),
+            pilots: rr0TestUtil.filePath("people/pilotes.html"),
+            military: rr0TestUtil.filePath("people/militaires.html"),
+            softwareEngineers: rr0TestUtil.filePath("tech/info/Personnes.html"),
+            politicians: rr0TestUtil.filePath("people/politicians.html"),
+            rulers: rr0TestUtil.filePath("people/dirigeants.html")
         };
-        const sourceRegistryFileName = testFilePath("source/index.json");
+        const sourceRegistryFileName = rr0TestUtil.filePath("source/index.json");
         const siteBaseUrl = "https://rr0.org/";
         const mail = "rr0@rr0.org";
-        const timeOptions = { rootDir: testFilePath("time"), files: timeFiles };
+        const timeOptions = { rootDir: rr0TestUtil.filePath("time"), files: timeFiles };
         // const actions: ChronologyReplacerActions = {read: ["backup", "fetch"], write: ["backup", "pages"]}
         // const actions: ChronologyReplacerActions = {read: [], write: ["backup"]}
         const actions = { read: ["fetch"], write: ["backup"] };
@@ -139,10 +139,10 @@ describe("Build", () => {
         const generator = new CMSGenerator({
             contentRoots, copies, outDir, locale: "fr", googleMapsApiKey, mail, timeOptions,
             siteBaseUrl, timeFormat, directoryPages,
-            ufoCaseDirectoryFile: testFilePath("science/crypto/ufo/enquete/dossier/index.html"),
-            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(testFilePath),
+            ufoCaseDirectoryFile: rr0TestUtil.filePath("science/crypto/ufo/enquete/dossier/index.html"),
+            ufoCasesExclusions: ["science/crypto/ufo/enquete/dossier/canular"].map(path => rr0TestUtil.filePath(path)),
             sourceRegistryFileName,
-            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(testFilePath),
+            directoryExcluded: ["people/Astronomers_fichiers", "people/witness", "people/author"].map(path => rr0TestUtil.filePath(path)),
             directoryOptions,
             mappings,
             contentReplacers: [...pageReplacers, ...contentsReplacers]

package/dist/DescriptionReplaceCommand.d.ts

@@ -1,5 +1,5 @@
 import { HtmlRR0Context } from "./RR0Context.js";
-import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
+import { ReplaceCommand } from "ssg-api";
 /**
  * Adds an "abstract" HTML paragraph from a <meta name="description">, if any.
  */

package/dist/ImageCommand.js

@@ -1,7 +1,7 @@
 import { DomReplaceCommand } from "ssg-api";
 import * as path from "path";
 import * as fs from "fs";
-import sizeOf from "image-size";
+import { imageSizeFromFile } from "image-size/fromFile";
 /**
  * Register images (`<img>` tags) required in an HTML file.
  */
@@ -45,7 +45,7 @@ export class ImageCommand extends DomReplaceCommand {
                     let imgPath = isExternal ? src : isAbsolute ? path.join(".", src) : path.join(path.dirname(context.file.name), src);
                     imgEl.loading = "lazy";
                     if (!isExternal && !imgEl.width && !imgEl.height) {
-                        const dimensions = sizeOf(imgPath);
+                        const dimensions = await imageSizeFromFile(imgPath);
                         let width = dimensions.width;
                         let height = dimensions.height;
                         if (width > this.maxWidth) {

package/dist/OpenGraphCommand.d.ts

@@ -1,4 +1,4 @@
-import { ReplaceCommand } from "ssg-api/dist/src/step/content/replace/ReplaceCommand.js";
+import { ReplaceCommand } from "ssg-api";
 import { HtmlRR0Context } from "./RR0Context.js";
 import { Canvas, CanvasRenderingContext2D } from "canvas";
 import { TimeService, TimeTextBuilder } from "./time/index.js";

package/dist/OpenGraphCommand.test.js

@@ -4,8 +4,7 @@ import { describe, expect, test } from "@javarome/testscript";
 describe("OpenGraphCommand", () => {
     const outDir = "/out";
     test("time page", () => {
-        const timeFile = rr0TestUtil.time.filePath("0/0/6/5/index.html");
-        const context = rr0TestUtil.newHtmlContext(timeFile, "");
+        const context = rr0TestUtil.time.newHtmlContext("0/0/6/5/index.html", "");
         const command = new OpenGraphCommand(outDir, [context.file.name], "https://rr0.org", rr0TestUtil.time.getService(), rr0TestUtil.time.timeTextBuilder);
         expect(command.getInfoStr(context)).toBe("Chronologie, RR0.org");
     });

package/dist/PerFileCounter.d.ts

@@ -1,4 +1,4 @@
-import { HtmlSsgContext } from "ssg-api/dist/src/HtmlSsgContext.js";
+import { HtmlSsgContext } from "ssg-api";
 import { ReferenceGenerator } from "./ReferenceGenerator.js";
 export declare abstract class PerFileCounter<C extends HtmlSsgContext> implements ReferenceGenerator<C> {
     /**

package/dist/RR0Context.d.ts

@@ -4,7 +4,7 @@ import { TimeContext } from "@rr0/time";
 import { FileContents } from "@javarome/fileutil";
 import { PlaceContext } from "@rr0/place";
 import { People } from "@rr0/data";
-import { CMSContext } from "./CMSContext";
+import { CMSContext } from "./CMSContext.js";
 export interface RR0Context extends SsgContext {
     readonly messages: RR0Messages;
     readonly time: TimeContext;
@@ -24,12 +24,13 @@ export declare class RR0ContextImpl extends SsgContextImpl {
     readonly time: TimeContext;
     readonly config: FileWriteConfig;
     readonly people: any;
-    readonly messages: RR0Messages;
+    protected _messages?: RR0Messages;
     readonly cms: CMSContext;
     readonly images: Set<string>;
     protected readonly fileMap: Map<string, FileContents>;
     place: PlaceContext;
-    constructor(locale: string, time: TimeContext, config: FileWriteConfig, people?: any, currentFile?: FileContents | undefined, messages?: RR0Messages, cms?: CMSContext);
+    constructor(locale: string, time: TimeContext, config: FileWriteConfig, people?: any, currentFile?: FileContents | undefined, _messages?: RR0Messages, cms?: CMSContext);
+    get messages(): RR0Messages;
     read(filePath: string): FileContents;
     clone(locale?: string): RR0ContextImpl;
     toString(): string;

package/dist/RR0Context.js

@@ -2,25 +2,32 @@ import { ssgMessages } from "./lang/index.js";
 import { ConsoleLogger, SsgContextImpl } from "ssg-api";
 import { PlaceContext } from "@rr0/place";
 export class RR0ContextImpl extends SsgContextImpl {
-    constructor(locale, time, config, people = undefined, currentFile = undefined, messages = ssgMessages[locale], cms = undefined) {
+    constructor(locale, time, config, people = undefined, currentFile = undefined, _messages, cms = undefined) {
         super(locale, new Map(), "RR0", new ConsoleLogger("RR0"), currentFile);
         this.time = time;
         this.config = config;
         this.people = people;
-        this.messages = messages;
+        this._messages = _messages;
         this.cms = cms;
         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.place = new PlaceContext(locale, this.messages.context.place);
+    }
+    get messages() {
+        let messages = this._messages;
+        if (!messages) {
+            let locale = this.locale;
+            while (!messages) {
+                if (locale.length > 2) {
+                    locale = locale.substring(0, 2); // Fallback to language without country specifics
+                }
+                messages = ssgMessages[locale];
+                if (!messages) {
+                    locale = "fr"; // Default language
+                }
             }
-            this.messages = ssgMessages[locale];
         }
-        this.place = new PlaceContext(locale, this.messages.context.place);
+        return messages;
     }
     read(filePath) {
         let file = this.fileMap.get(filePath);

package/dist/RR0Context.test.js

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

package/dist/ReferenceGenerator.d.ts

@@ -1,4 +1,4 @@
-import { HtmlSsgContext } from "ssg-api/dist/src/HtmlSsgContext.js";
+import { HtmlSsgContext } from "ssg-api";
 export interface ReferenceGenerator<C extends HtmlSsgContext> {
     readonly value: string;
     next(context: C): string;

package/dist/anchor/AnchorReplaceCommandTest.js

@@ -2,7 +2,7 @@ import { AnchorReplaceCommand } from "./AnchorReplaceCommand.js";
 import { rr0TestUtil } from "../test/index.js";
 import { describe, expect, test } from "@javarome/testscript";
 import { CaseAnchorHandler } from "./CaseAnchorHandler.js";
-import { CaseService } from "../science/index.js";
+import { CaseService } from "../science/crypto/ufo/enquete/dossier/CaseService.js";
 import { TimeElementFactory, TimeRenderer, TimeTextBuilder } from "../time/index.js";
 import path from "path";
 describe("AnchorReplaceCommand", () => {

package/dist/book/Book.d.ts

@@ -1,6 +1,6 @@
 import { Chapter } from "./Chapters.js";
-import { Source } from "@rr0/data/dist/source";
-export interface Book extends Source {
+import { Source } from "@rr0/data";
+export declare class Book extends Source<"book"> {
     type: "book";
     /**
      * Variants roots (language-specific, typically)

package/dist/book/Book.js

@@ -1 +1,3 @@
-export {};
+import { Source } from "@rr0/data";
+export class Book extends Source {
+}

package/dist/book/BookDirectoryStep.d.ts

@@ -1,5 +1,5 @@
-import { HtmlRR0Context } from "RR0Context.js";
 import { DirectoryStep, FileWriteConfig, HtmlLinks, HtmlMeta, OutputFunc } from "ssg-api";
+import { HtmlRR0Context } from "RR0Context.js";
 import { Book } from "./Book.js";
 /**
  * Scan directories for book information, then populates a template with collected data.

package/dist/book/BookDirectoryStep.js

@@ -1,11 +1,11 @@
+import fs from "fs";
+import path from "path";
+import { FileContents } from "@javarome/fileutil";
 import { DirectoryStep } from "ssg-api";
 import { RR0FileUtil } from "../util/file/RR0FileUtil.js";
 import { StringUtil } from "../util/string/StringUtil.js";
 import { HtmlTag } from "../util/html/HtmlTag.js";
-import fs from "fs";
-import path from "path";
 import { Chapter } from "./Chapters.js";
-import { FileContents } from "@javarome/fileutil";
 /**
  * Scan directories for book information, then populates a template with collected data.
  */

package/dist/book/BookJson.d.ts

@@ -1,5 +1,5 @@
 import { Chapter } from "./Chapters.js";
-import { SourceJson } from "@rr0/data/dist/source";
+import { SourceJson } from "@rr0/data";
 export interface BookJson extends SourceJson {
     type: "book";
     /**

package/dist/book/BookService.d.ts

@@ -1,6 +1,6 @@
 import { FileWriteConfig, Logger } from "ssg-api";
 import { Book } from "./Book.js";
-import { TimeUrlBuilder } from "../time";
+import { TimeUrlBuilder } from "../time/TimeUrlBuilder.js";
 import { People, PeopleService } from "@rr0/data";
 export declare class BookService {
     readonly logger: Logger;

package/dist/book/BookService.test.js

@@ -2,9 +2,9 @@ import path from "path";
 import { ConsoleLogger } from "ssg-api";
 import { CLI } from "../util/cli/CLI.js";
 import { AllDataService, PeopleService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
-import { BookService } from "./BookService";
-import { TimeUrlBuilder } from "../time";
-import { rr0TestUtil, testFilePath } from "../test";
+import { BookService } from "./BookService.js";
+import { TimeUrlBuilder } from "../time/TimeUrlBuilder.js";
+import { rr0TestUtil } from "../test/index.js";
 const logger = new ConsoleLogger("rr0-books");
 const args = new CLI().getArgs();
 const fileName = args.import;
@@ -19,13 +19,9 @@ const config = {
         return path.join(outDir, context.file.name);
     }
 };
-const timeOptions = {
-    rootDir: testFilePath("time"),
-    files: []
-};
-const timeUrlBuilder = new TimeUrlBuilder(timeOptions);
+const timeUrlBuilder = new TimeUrlBuilder(rr0TestUtil.time.timeOptions);
 let files = [];
-const peopleService = new PeopleService(dataService, peopleFactory, { files, rootDir: testFilePath("people") });
+const peopleService = new PeopleService(dataService, peopleFactory, { files, rootDir: rr0TestUtil.filePath("people") });
 const books = new BookService(logger, dry, peopleService, timeUrlBuilder, config);
 books.import(fileName).then((result) => {
     logger.log("Wrote", result.length, "books");

package/dist/lang/RR0Messages.d.ts

@@ -2,7 +2,7 @@ import { CountryMessagesList } from "../org/CountryMessagesList.js";
 import { CaseConclusion } from "../science/crypto/ufo/enquete/dossier/RR0Case.js";
 import { PeopleMessages } from "../people/PeopleMessages.js";
 import { OrgRR0Messages } from "../org/OrgRR0Messages.js";
-import { PlaceMessages } from "@rr0/place/dist/lang/PlaceMessages";
+import { PlaceMessages } from "@rr0/place";
 export declare class MessageUtils {
     static plural(n: number, word: string): string;
     static pluralWord(n: number, word: string): string;

package/dist/org/Cities.js

@@ -1,14 +1,14 @@
-import { chinaCities } from "./cn/region/ChinaCities";
-import { usaCities } from "./us/region/UsaCities";
-import { australiaCities } from "./au";
-import { brazilCities } from "./br/region/BrazilCities";
-import { canadaCities } from "./ca/region/CanadaCities";
-import { europeCities } from "./eu/EuropeCities";
-import { indiaCities } from "./in/region/IndiaCities";
-import { ukCities } from "./uk/region/UkCities";
-import { mozambiqueCities } from "./mz/region/MozambiqueCities";
-import { newZealandCities } from "./nz/region/NewZealandCities";
-import { russiaCities } from "./ru/region/RussiaCities";
+import { chinaCities } from "./cn/region/ChinaCities.js";
+import { usaCities } from "./us/region/UsaCities.js";
+import { australiaCities } from "./au/index.js";
+import { brazilCities } from "./br/region/BrazilCities.js";
+import { canadaCities } from "./ca/region/CanadaCities.js";
+import { europeCities } from "./eu/EuropeCities.js";
+import { indiaCities } from "./in/region/IndiaCities.js";
+import { ukCities } from "./uk/region/UkCities.js";
+import { mozambiqueCities } from "./mz/region/MozambiqueCities.js";
+import { newZealandCities } from "./nz/region/NewZealandCities.js";
+import { russiaCities } from "./ru/region/RussiaCities.js";
 export const cities = [
     ...chinaCities,
     ...australiaCities,

package/dist/org/CmsOrganizationFactory.d.ts

@@ -1,6 +1,5 @@
 import { CmsOrganization } from "./CmsOrganization.js";
-import { OrganizationFactory, RR0EventFactory } from "@rr0/data";
-import { OrganizationJson } from "@rr0/data/dist/org/OrganizationJson";
+import { OrganizationFactory, OrganizationJson, RR0EventFactory } from "@rr0/data";
 export declare class CmsOrganizationFactory extends OrganizationFactory {
     constructor(eventFactory: RR0EventFactory);
     parse(dataJson: OrganizationJson): CmsOrganization;

package/dist/org/CountryMessageList_en.js

@@ -26,7 +26,7 @@ import { tunisia_en } from "./tn/Tunisia_en.js";
 import { ecuador_en } from "./ec/Ecuador_en.js";
 import { egypt_en } from "./eg/Egypt_en.js";
 import { georgia_en } from "./ge/Georgia_en.js";
-import { china_en } from "./cn/ChinaMessages_en";
+import { china_en } from "./cn/ChinaMessages_en.js";
 export const countryMessageList_en = {
     at: CountryMessages.create("Austria"),
     ar: CountryMessages.create("Argentina"),

package/dist/org/CountryMessageList_fr.js

@@ -26,7 +26,7 @@ import { tunisia_fr } from "./tn/Tunisia_fr.js";
 import { ecuador_fr } from "./ec/Ecuador_fr.js";
 import { egypt_fr } from "./eg/Egypt_fr.js";
 import { georgia_fr } from "./ge/Georgia_fr.js";
-import { china_fr } from "./cn/ChinaMessages_fr";
+import { china_fr } from "./cn/ChinaMessages_fr.js";
 /**
  * Country messages in French language.
  */

package/dist/org/OrganizationService.d.ts

@@ -1,6 +1,6 @@
 import { CmsOrganization } from "./CmsOrganization.js";
 import { RR0Context } from "../RR0Context.js";
-import { CmsOrganizationFactory } from "./CmsOrganizationFactory";
+import { CmsOrganizationFactory } from "./CmsOrganizationFactory.js";
 export declare class OrganizationService<O extends CmsOrganization = CmsOrganization, P extends CmsOrganization = undefined> {
     readonly orgs: O[];
     readonly rootDir: string;

package/dist/org/au/Australia.d.ts

@@ -1,2 +1,2 @@
-import { CmsCountry } from "../country/CmsCountry";
+import { CmsCountry } from "../country/CmsCountry.js";
 export declare const australia: CmsCountry;

package/dist/org/au/Australia.js

@@ -1,3 +1,3 @@
 import { CountryCode } from "@rr0/data";
-import { CmsCountry } from "../country/CmsCountry";
+import { CmsCountry } from "../country/CmsCountry.js";
 export const australia = new CmsCountry(CountryCode.au, []);

package/dist/org/au/index.d.ts

@@ -2,4 +2,4 @@ export * from "./Australia.js";
 export * from "./Australia_en.js";
 export * from "./Australia_fr.js";
 export * from "./AustraliaRegionsMessages.js";
-export * from "./region";
+export * from "./region/index.js";

package/dist/org/au/index.js

@@ -2,4 +2,4 @@ export * from "./Australia.js";
 export * from "./Australia_en.js";
 export * from "./Australia_fr.js";
 export * from "./AustraliaRegionsMessages.js";
-export * from "./region";
+export * from "./region/index.js";

package/dist/org/ca/Canada.d.ts

@@ -1,2 +1,2 @@
-import { CmsCountry } from "../country/CmsCountry";
+import { CmsCountry } from "../country/CmsCountry.js";
 export declare const canada: CmsCountry;

package/dist/org/ca/Canada.js

@@ -1,3 +1,3 @@
 import { CountryCode } from "@rr0/data";
-import { CmsCountry } from "../country/CmsCountry";
+import { CmsCountry } from "../country/CmsCountry.js";
 export const canada = new CmsCountry(CountryCode.ca);

package/dist/org/cn/China.d.ts

@@ -1,2 +1,2 @@
-import { CmsCountry } from "../country/CmsCountry";
+import { CmsCountry } from "../country/CmsCountry.js";
 export declare const china: CmsCountry;

package/dist/org/cn/China.js

@@ -1,4 +1,4 @@
 import { CountryCode } from "@rr0/data";
-import { CmsCountry } from "../country/CmsCountry";
+import { CmsCountry } from "../country/CmsCountry.js";
 import { Place, PlaceLocation } from "@rr0/place";
 export const china = new CmsCountry(CountryCode.cn, [new Place([PlaceLocation.fromDMS("35°0'N,103°0'E")])]);

package/dist/org/cn/ChinaMessages_cn.js

@@ -1,5 +1,5 @@
 import { CountryMessages } from "../country/index.js";
-import { northChinaMessages_cn } from "./region/n/NorthChinaMessages_cn";
+import { northChinaMessages_cn } from "./region/n/NorthChinaMessages_cn.js";
 export const china_cn = new CountryMessages(["中国", "中华人民共和国", "zhōngguó"], {
     n: northChinaMessages_cn
 });

package/dist/org/cn/ChinaMessages_en.js

@@ -1,5 +1,5 @@
 import { CountryMessages } from "../country/index.js";
-import { northChinaMessages_en } from "./region/n/NorthChinaMessages_en";
+import { northChinaMessages_en } from "./region/n/NorthChinaMessages_en.js";
 export const china_en = new CountryMessages(["China", "People's Republic of China", "PRC"], {
     n: northChinaMessages_en
 });

package/dist/org/cn/ChinaMessages_fr.js

@@ -1,5 +1,5 @@
 import { CountryMessages } from "../country/index.js";
-import { northChinaMessages_fr } from "./region/n/NorthChinaMessages_fr";
+import { northChinaMessages_fr } from "./region/n/NorthChinaMessages_fr.js";
 export const china_fr = new CountryMessages(["Chine", "République Populaire de Chine", "RPC", "Chine populaire", "Chine communiste"], {
     n: northChinaMessages_fr
 });

package/dist/org/cn/region/ChinaCities.js

@@ -1,4 +1,4 @@
-import { hebeiCities } from "./n/ji/HebeiCities";
+import { hebeiCities } from "./n/ji/HebeiCities.js";
 export const chinaCities = [
     ...hebeiCities
 ];