@rr0/cms 0.3.62 → 0.3.63

package/dist/CMSContext.d.ts

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

package/dist/CMSGenerator.d.ts

@@ -1,10 +1,23 @@
-import { HttpSource, RR0CaseMapping, TimeElementFactory, TimeRenderer, TimeReplacer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "./time/index.js";
-import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/crypto/ufo/enquete/dossier/index.js";
-import { CityService, DepartmentService, OrganizationService } from "./org/index.js";
+import { TimeService } from "./time/TimeService.js";
+import { TimeUrlBuilder } from "./time/TimeUrlBuilder.js";
+import { HttpSource } from "./time/datasource/HttpSource.js";
+import { RR0CaseMapping } from "./time/datasource/rr0/RR0CaseMapping.js";
+import { TimeElementFactory } from "./time/html/TimeElementFactory.js";
+import { TimeRenderer } from "./time/html/TimeRenderer.js";
+import { TimeReplacer } from "./time/html/TimeReplacer.js";
+import { TimeTextBuilder } from "./time/text/TimeTextBuilder.js";
+import { CaseDirectoryStep } from "./science/crypto/ufo/enquete/dossier/CaseDirectoryStep.js";
+import { CaseFactory } from "./science/crypto/ufo/enquete/dossier/CaseFactory.js";
+import { CaseService } from "./science/crypto/ufo/enquete/dossier/CaseService.js";
+import { OrganizationService } from "./org/OrganizationService.js";
+import { DepartmentService } from "./org/country/region/department/DepartmentService.js";
+import { CityService } from "./org/country/region/department/city/CityService.js";
 import { HtmlRR0Context, RR0ContextImpl } from "./RR0Context.js";
 import { FileWriteConfig, ReplaceCommand } from "ssg-api";
-import { PeopleDirectoryStepOptions } from "./people/index.js";
-import { PersistentSourceRegistry, SourceRenderer, SourceReplacerFactory } from "./source/index.js";
+import { PeopleDirectoryStepOptions } from "./people/PeopleDirectoryStepFactory.js";
+import { PersistentSourceRegistry } from "./source/PersistentSourceRegistry.js";
+import { SourceRenderer } from "./source/SourceRenderer.js";
+import { SourceReplacerFactory } from "./source/SourceReplacerFactory.js";
 import { AllDataService, PeopleFactory, PeopleService } from "@rr0/data";
 import { GooglePlaceService } from "@rr0/place";
 import { PeopleHtmlRenderer } from "./people/PeopleHtmlRenderer.js";
@@ -119,7 +132,7 @@ export declare class CMSGenerator implements CMSContext {
     };
     protected setupPeople(context: RR0ContextImpl, peopleRenderer: PeopleHtmlRenderer, copies: string[]): Promise<{
         peopleService: PeopleService;
-        peopleSteps: import("./people/PeopleDirectoryStep.js").PeopleDirectoryStep[];
+        peopleSteps: import("./index.js").PeopleDirectoryStep[];
         copies: string[];
     }>;
     private setupNotes;

package/dist/CMSGenerator.js

@@ -1,22 +1,57 @@
 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/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 { CaseSummaryRenderer } from "./time/CaseSummaryRenderer.js";
+import { EventReplacer, EventReplacerFactory } from "./time/EventReplacerFactory.js";
+import { SsiTitleReplaceCommand } from "./time/SsiTitleReplaceCommand.js";
+import { TimeLinkDefaultHandler } from "./time/TimeLinkDefaultHandler.js";
+import { TimeService } from "./time/TimeService.js";
+import { TimeUrlBuilder } from "./time/TimeUrlBuilder.js";
+import { ChronologyReplacerFactory } from "./time/datasource/ChronologyReplacerFactory.js";
+import { CsvMapper } from "./time/datasource/CsvMapper.js";
+import { HttpSource } from "./time/datasource/HttpSource.js";
+import { TimeElementFactory } from "./time/html/TimeElementFactory.js";
+import { TimeRenderer } from "./time/html/TimeRenderer.js";
+import { TimeReplacer } from "./time/html/TimeReplacer.js";
+import { TimeReplacerFactory } from "./time/html/TimeReplacerFactory.js";
+import { TimeTextBuilder } from "./time/text/TimeTextBuilder.js";
+import { CaseDirectoryStep } from "./science/crypto/ufo/enquete/dossier/CaseDirectoryStep.js";
+import { CaseFactory } from "./science/crypto/ufo/enquete/dossier/CaseFactory.js";
+import { CaseService } from "./science/crypto/ufo/enquete/dossier/CaseService.js";
+import { cities } from "./org/Cities.js";
+import { CmsOrganizationFactory } from "./org/CmsOrganizationFactory.js";
+import { OrganizationService } from "./org/OrganizationService.js";
+import { countries } from "./org/country/Countries.js";
+import { RegionService, regions } from "./org/country/region/RegionService.js";
+import { DepartmentService, departments } from "./org/country/region/department/DepartmentService.js";
+import { CityService } from "./org/country/region/department/city/CityService.js";
 import { RR0ContextImpl } from "./RR0Context.js";
-import { HtmlTable } from "./util/index.js";
+import { HtmlTable } from "./util/html/HtmlTable.js";
 import { ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtAccessToNetlifyRedirectsReplaceCommand, HtmlFileContents, Ssg, SsiIncludeReplaceCommand } from "ssg-api";
-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 { PeopleDirectoryStepFactory } from "./people/PeopleDirectoryStepFactory.js";
+import { PeopleReplacerFactory } from "./people/PeopleReplacerFactory.js";
+import { AuthorReplaceCommand } from "./people/author/AuthorReplaceCommand.js";
+import { PersistentSourceRegistry } from "./source/PersistentSourceRegistry.js";
+import { SourceFileCounter } from "./source/SourceFileCounter.js";
+import { SourceIndexStep } from "./source/SourceIndexStep.js";
+import { SourceRenderer } from "./source/SourceRenderer.js";
+import { SourceReplacer } from "./source/SourceReplacer.js";
+import { SourceReplacerFactory } from "./source/SourceReplacerFactory.js";
+import { NoteFileCounter } from "./note/NoteFileCounter.js";
+import { NoteRenderer } from "./note/NoteRenderer.js";
+import { NoteReplacer } from "./note/NoteReplacer.js";
+import { NoteReplacerFactory } from "./note/NoteReplacerFactory.js";
+import { AnchorReplaceCommand } from "./anchor/AnchorReplaceCommand.js";
+import { CaseAnchorHandler } from "./anchor/CaseAnchorHandler.js";
+import { DataAnchorHandler } from "./anchor/DataAnchorHandler.js";
 import { MetaLinkReplaceCommand } from "./MetaLinkReplaceCommand.js";
-import { OutlineReplaceCommand } from "./outline/index.js";
+import { OutlineReplaceCommand } from "./outline/OutlineReplaceCommand.js";
 import { ImageCommand } from "./ImageCommand.js";
-import { SearchIndexStep, SearchVisitor } from "./search/index.js";
+import { SearchIndexStep } from "./search/SearchIndexStep.js";
+import { SearchVisitor } from "./search/SearchVisitor.js";
 import { OpenGraphCommand } from "./OpenGraphCommand.js";
-import { BookContentVisitor, BookDirectoryStep } from "./book/index.js";
-import { APIFactory } from "./tech/index.js";
+import { BookContentVisitor } from "./book/BookContentVisitor.js";
+import { BookDirectoryStep } from "./book/BookDirectoryStep.js";
+import { APIFactory } from "./tech/info/soft/APIFactory.js";
 import { RR0ContentStep } from "./RR0ContentStep.js";
 import { DataContentVisitor } from "./DataContentVisitor.js";
 import { writeFile } from "@javarome/fileutil";

package/dist/CMSGenerator.test.js

@@ -1,8 +1,17 @@
 import { glob } from "glob";
-import { describe } from "@javarome/testscript";
+import { existsSync } from "fs";
+import path from "path";
+import { describe, expect, test } from "vitest";
+/** A whole site generation, which is minutes rather than the seconds a unit test takes. */
+const GENERATION_TIMEOUT_MS = 30 * 60 * 1000;
 import { CMSGenerator } from "./CMSGenerator.js";
-import { BaseOvniFranceRR0Mapping, FuforaRR0Mapping, NuforcRR0Mapping, RR0Mapping, SceauRR0Mapping, UrecatRR0Mapping } from "./time/index.js";
-import { WitnessReplacerFactory } from "./people/index.js";
+import { BaseOvniFranceRR0Mapping } from "./time/datasource/baseovnifrance/BaseOvniFranceRR0Mapping.js";
+import { FuforaRR0Mapping } from "./time/datasource/fufora/FuforaRR0Mapping.js";
+import { NuforcRR0Mapping } from "./time/datasource/nuforc/NuforcRR0Mapping.js";
+import { RR0Mapping } from "./time/datasource/rr0/RR0Mapping.js";
+import { SceauRR0Mapping } from "./time/datasource/sceau/SceauRR0Mapping.js";
+import { UrecatRR0Mapping } from "./time/datasource/urecat/UrecatRR0Mapping.js";
+import { WitnessReplacerFactory } from "./people/witness/WitnessReplacerFactory.js";
 import * as process from "node:process";
 import { GeipanRR0Mapping } from "./org/eu/fr/cnes/geipan/geipan/GeipanRR0Mapping.js";
 import { BaseReplaceCommand } from "./BaseReplaceCommand.js";
@@ -10,10 +19,11 @@ import { LanguageReplaceCommand } from "./lang/LanguageReplaceCommand.js";
 import { AngularExpressionReplaceCommand, ClassDomReplaceCommand, DomReplaceCommand, SsiEchoVarReplaceCommand, SsiIfReplaceCommand, SsiLastModifiedReplaceCommand, SsiSetVarReplaceCommand, StringEchoVarReplaceCommand } from "ssg-api";
 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 { cmsTestUtil } from "./test/index.js";
+import { CodeReplacerFactory } from "./tech/info/soft/proj/impl/lang/CodeReplacerFactory.js";
+import { PlaceReplacerFactory } from "./place/PlaceReplacerFactory.js";
+import { IndexedReplacerFactory } from "./index/IndexedReplacerFactory.js";
+import { UnitReplaceCommand } from "./value/UnitReplaceCommand.js";
+import { cmsTestUtil } from "./test/CMSTestUtil.js";
 export async function getTimeFiles() {
     const minusYearFiles = await glob(cmsTestUtil.filePath("time/-?/?/?/?/index.html"));
     const year1Files = await glob(cmsTestUtil.filePath("time/?/index.html"));
@@ -84,7 +94,13 @@ describe("Build", () => {
         "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(path => cmsTestUtil.filePath(path));
-    getTimeFiles().then(async (timeFiles) => {
+    // A REAL TEST NOW, and it was not one before: the whole of this ran inside a `.then()` at describe
+    // time, with no test() anywhere and nothing asserted. testscript ran it as a side effect and
+    // reported the suite as passing, which is how a fifty-minute site build came to count as a green
+    // test. vitest collects synchronously, so a suite that registers its work in a promise registers
+    // nothing at all — which is what said "No test found in suite Build".
+    test("generates the site", async () => {
+        const timeFiles = await getTimeFiles();
         const orgFiles = await glob("test/org/**/index.html");
         const directoryOptions = {
             root: cmsTestUtil.filePath("people/index.html"),
@@ -154,5 +170,10 @@ describe("Build", () => {
             contentReplacers: [...pageReplacers, ...contentsReplacers]
         });
         await generator.generate(args);
-    });
+        // The one thing worth asserting about a generation: that it put pages where it said it would.
+        // Before this the run could have produced nothing at all and still been green. The content roots
+        // are under test/, so that is where the output mirrors them.
+        expect(existsSync(path.join(outDir, "test", "index.html"))).toBe(true);
+        expect(existsSync(path.join(outDir, "casesDirs.json"))).toBe(true);
+    }, GENERATION_TIMEOUT_MS);
 });

package/dist/DataContentVisitor.test.js

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "@javarome/testscript";
+import { describe, expect, test } from "vitest";
 import { DataContentVisitor } from "./DataContentVisitor.js";
-import { cmsTestUtil } from "./test/index.js";
+import { cmsTestUtil } from "./test/CMSTestUtil.js";
 class TestDataContentVisitor extends DataContentVisitor {
     constructor() {
         super(undefined, { renderEnd: async () => undefined }, undefined);

package/dist/IndexDirectoryStep.js

@@ -1,5 +1,5 @@
 import { DirectoryStep } from "ssg-api";
-import { StringUtil } from "./util/index.js";
+import { StringUtil } from "./util/string/StringUtil.js";
 /**
  * Builds a directory index.
  */

package/dist/OpenGraphCommand.d.ts

@@ -1,7 +1,8 @@
 import { ReplaceCommand } from "ssg-api";
 import { HtmlRR0Context } from "./RR0Context.js";
 import { Canvas, CanvasRenderingContext2D } from "canvas";
-import { TimeService, TimeTextBuilder } from "./time/index.js";
+import { TimeService } from "./time/TimeService.js";
+import { TimeTextBuilder } from "./time/text/TimeTextBuilder.js";
 /**
  * Create a preview image for each page sharing.
  */

package/dist/OpenGraphCommand.test.js

@@ -1,6 +1,6 @@
 import { OpenGraphCommand } from "./OpenGraphCommand.js";
-import { cmsTestUtil } from "./test/index.js";
-import { describe, expect, test } from "@javarome/testscript";
+import { cmsTestUtil } from "./test/CMSTestUtil.js";
+import { describe, expect, test } from "vitest";
 describe("OpenGraphCommand", () => {
     const outDir = "/out";
     test("time page", () => {

package/dist/RR0ContentStep.d.ts

@@ -1,6 +1,6 @@
 import { ContentStep, ContentStepConfig, ContentStepResult, OutputFunc } from "ssg-api";
 import { HtmlRR0Context } from "./RR0Context.js";
-import { TimeService } from "./time/index.js";
+import { TimeService } from "./time/TimeService.js";
 export interface ContentVisitor {
     visit(context: HtmlRR0Context): Promise<void>;
 }

package/dist/RR0Context.d.ts

@@ -1,4 +1,4 @@
-import { RR0Messages } from "./lang/index.js";
+import { RR0Messages } from "./lang/RR0Messages.js";
 import { FileWriteConfig, HtmlSsgContext, SsgContext, SsgContextImpl } from "ssg-api";
 import { FileContents } from "@javarome/fileutil";
 import { PlaceContext } from "@rr0/place";

package/dist/RR0Context.js

@@ -1,4 +1,4 @@
-import { ssgMessages } from "./lang/index.js";
+import { ssgMessages } from "./lang/ssgMessages.js";
 import { ConsoleLogger, SsgContextImpl } from "ssg-api";
 import { PlaceContext } from "@rr0/place";
 export class RR0ContextImpl extends SsgContextImpl {

package/dist/RR0Context.test.js

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "./test/index.js";
-import { ssgMessages } from "./lang/index.js";
+import { describe, expect, test } from "vitest";
+import { cmsTestUtil } from "./test/CMSTestUtil.js";
+import { ssgMessages } from "./lang/ssgMessages.js";
 describe("RROContextImpl", () => {
     describe("constructor with locale", () => {
         test("default locale", () => {

package/dist/anchor/AnchorReplaceCommandTest.js

@@ -1,9 +1,11 @@
 import { AnchorReplaceCommand } from "./AnchorReplaceCommand.js";
-import { cmsTestUtil } from "../test/index.js";
-import { describe, expect, test } from "@javarome/testscript";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
+import { describe, expect, test } from "vitest";
 import { CaseAnchorHandler } from "./CaseAnchorHandler.js";
 import { CaseService } from "../science/crypto/ufo/enquete/dossier/CaseService.js";
-import { TimeElementFactory, TimeRenderer, TimeTextBuilder } from "../time/index.js";
+import { TimeElementFactory } from "../time/html/TimeElementFactory.js";
+import { TimeRenderer } from "../time/html/TimeRenderer.js";
+import { TimeTextBuilder } from "../time/text/TimeTextBuilder.js";
 import path from "path";
 describe("AnchorReplaceCommand", () => {
     test("replace anchor tag", async () => {

package/dist/anchor/AnchorReplacerTest.js

@@ -1,7 +1,7 @@
 import { AnchorReplacer } from "./AnchorReplacer.js";
-import { cmsTestUtil } from "../test/index.js";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
 import { JSDOM } from "jsdom";
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
+import { beforeEach, describe, expect, test } from "vitest";
 describe("AnchorReplacer", () => {
     let document;
     beforeEach(async () => {

package/dist/anchor/CaseAnchorHandler.d.ts

@@ -1,6 +1,6 @@
 import { AnchorHandler } from "./AnchorHandler.js";
 import { HtmlRR0Context } from "RR0Context.js";
-import { TimeTextBuilder } from "../time/index.js";
+import { TimeTextBuilder } from "../time/text/TimeTextBuilder.js";
 import { CaseService } from "../science/crypto/ufo/enquete/dossier/CaseService.js";
 export declare class CaseAnchorHandler implements AnchorHandler {
     protected caseService: CaseService;

package/dist/book/{BookService.test.js → BookImport.js}

@@ -4,7 +4,7 @@ import { CLI } from "../util/cli/CLI.js";
 import { AllDataService, PeopleService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 import { BookService } from "./BookService.js";
 import { TimeUrlBuilder } from "../time/TimeUrlBuilder.js";
-import { cmsTestUtil } from "../test/index.js";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
 const logger = new ConsoleLogger("rr0-books");
 const args = new CLI().getArgs();
 const fileName = args.import;

package/dist/lang/LanguageReplaceCommand.test.js

@@ -1,6 +1,6 @@
 import { LanguageReplaceCommand } from "./LanguageReplaceCommand.js";
-import { cmsTestUtil } from "../test/index.js";
-import { describe, expect, test } from "@javarome/testscript";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
+import { describe, expect, test } from "vitest";
 describe("LanguageReplaceCommand", () => {
     test("add default english translation", async () => {
         const context = cmsTestUtil.time.newHtmlContext("1/9/6/8/CondonReport/index_fr.html", `<span id="alternate"/>`);

package/dist/lang/RR0Messages_fr.d.ts

@@ -45,10 +45,10 @@ export declare class RR0Messages_fr implements RR0Messages {
         };
         conclusion: CaseConclusionMessages;
     };
-    org: import("../org/OrgRR0Messages.js").OrgRR0Messages;
-    people: import("../people/PeopleMessages.js").PeopleMessages;
+    org: import("../index.js").OrgRR0Messages;
+    people: import("../index.js").PeopleMessages;
     place: import("@rr0/place").PlaceMessages;
-    country: import("../org/CountryMessagesList.js").CountryMessagesList;
+    country: import("../index.js").CountryMessagesList;
     nav: {
         start: string;
         contents: string;

package/dist/lang/RR0Messages_fr.js

@@ -1,6 +1,7 @@
 import { placeMessages_fr } from "@rr0/place";
-import { peopleMessages_fr } from "../people/index.js";
-import { countryMessageList_fr, orgMessages_fr } from "../org/index.js";
+import { peopleMessages_fr } from "../people/PeopleMessages_fr.js";
+import { countryMessageList_fr } from "../org/CountryMessageList_fr.js";
+import { orgMessages_fr } from "../org/OrgRR0Messages_fr.js";
 import { RR0TimeMessages_fr } from "../time/RR0TimeMessages_fr.js";
 const caseConclusion_fr = {
     unknown: "inexpliqué",

package/dist/org/Cities.d.ts

@@ -1,2 +1,2 @@
-import { City } from "./country/index.js";
+import { City } from "./country/region/department/city/City.js";
 export declare const cities: City[];

package/dist/org/Cities.js

@@ -1,6 +1,6 @@
 import { chinaCities } from "./cn/region/ChinaCities.js";
 import { usaCities } from "./us/region/UsaCities.js";
-import { australiaCities } from "./au/index.js";
+import { australiaCities } from "./au/region/AustraliaCities.js";
 import { brazilCities } from "./br/region/BrazilCities.js";
 import { canadaCities } from "./ca/region/CanadaCities.js";
 import { europeCities } from "./eu/EuropeCities.js";

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

@@ -1,5 +1,5 @@
-import { RegionMessages } from "../country/index.js";
-import { AustraliaRegionCode } from "./region/index.js";
+import { RegionMessages } from "../country/region/RegionMessages.js";
+import { AustraliaRegionCode } from "./region/AustraliaRegionCode.js";
 export type AustraliaRegionsMessages = {
     [key in AustraliaRegionCode]: RegionMessages;
 };

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

@@ -1,11 +1,11 @@
-import { CountryMessages } from "../country/index.js";
+import { CountryMessages } from "../country/CountryMessages.js";
 export declare const australia_en: CountryMessages<{
-    nsw: import("../country/index.js").DepartmentMessages<{
-        "2529": import("../country/index.js").CityMessages;
+    nsw: import("../index.js").DepartmentMessages<{
+        "2529": import("../index.js").CityMessages;
     }>;
-    sa: import("../country/index.js").RegionMessages<{}>;
-    wa: import("../country/index.js").RegionMessages<{}>;
-    vic: import("../country/index.js").DepartmentMessages<{
-        "3000": import("../country/index.js").CityMessages;
+    sa: import("../index.js").RegionMessages<{}>;
+    wa: import("../index.js").RegionMessages<{}>;
+    vic: import("../index.js").DepartmentMessages<{
+        "3000": import("../index.js").CityMessages;
     }>;
 }>;

package/dist/org/au/Australia_en.js

@@ -1,5 +1,8 @@
-import { CountryMessages } from "../country/index.js";
-import { newSouthWales_en, southAustralia_en, victoria_en, westernAustralia_en } from "./region/index.js";
+import { CountryMessages } from "../country/CountryMessages.js";
+import { newSouthWales_en } from "./region/nsw/NewSouthWalesMessages_en.js";
+import { southAustralia_en } from "./region/sa/SouthAustraliaMessages_en.js";
+import { victoria_en } from "./region/vic/VictoriaMessages_en.js";
+import { westernAustralia_en } from "./region/wa/WesternAustraliaMessages_en.js";
 export const australia_en = CountryMessages.create("Australia", {
     nsw: newSouthWales_en,
     sa: southAustralia_en,

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

@@ -1,11 +1,11 @@
-import { CountryMessages } from "../country/index.js";
+import { CountryMessages } from "../country/CountryMessages.js";
 export declare const australia_fr: CountryMessages<{
-    nsw: import("../country/index.js").DepartmentMessages<{
-        "2529": import("../country/index.js").CityMessages;
+    nsw: import("../index.js").DepartmentMessages<{
+        "2529": import("../index.js").CityMessages;
     }>;
-    sa: import("../country/index.js").RegionMessages<{}>;
-    wa: import("../country/index.js").RegionMessages<{}>;
-    vic: import("../country/index.js").DepartmentMessages<{
-        "3000": import("../country/index.js").CityMessages;
+    sa: import("../index.js").RegionMessages<{}>;
+    wa: import("../index.js").RegionMessages<{}>;
+    vic: import("../index.js").DepartmentMessages<{
+        "3000": import("../index.js").CityMessages;
     }>;
 }>;

package/dist/org/au/Australia_fr.js

@@ -1,5 +1,9 @@
-import { CountryMessages } from "../country/index.js";
-import { AustraliaRegionCode, newSouthWales_fr, southAustralia_fr, victoria_fr, westernAustralia_fr } from "./region/index.js";
+import { CountryMessages } from "../country/CountryMessages.js";
+import { AustraliaRegionCode } from "./region/AustraliaRegionCode.js";
+import { newSouthWales_fr } from "./region/nsw/NewSouthWalesMessages_fr.js";
+import { southAustralia_fr } from "./region/sa/SouthAustraliaMessages_fr.js";
+import { victoria_fr } from "./region/vic/VictoriaMessages_fr.js";
+import { westernAustralia_fr } from "./region/wa/WesternAustraliaMessages_fr.js";
 export const australia_fr = CountryMessages.create("Australie", {
     [AustraliaRegionCode.nsw]: newSouthWales_fr,
     sa: southAustralia_fr,

package/dist/org/au/region/nsw/NewSouthWalesCities.d.ts

@@ -1,2 +1,2 @@
-import { City } from "../../../country/index.js";
+import { City } from "../../../country/region/department/city/City.js";
 export declare const newSouthWalesCities: City[];

package/dist/org/au/region/nsw/NewSouthWalesMessages_en.d.ts

@@ -1,4 +1,4 @@
-import { DepartmentMessages } from "../../../country/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export declare const newSouthWales_en: DepartmentMessages<{
-    "2529": import("../../../country/index.js").CityMessages;
+    "2529": import("../../../index.js").CityMessages;
 }>;

package/dist/org/au/region/nsw/NewSouthWalesMessages_en.js

@@ -1,6 +1,6 @@
-import { dunmoreNswMessages } from "./dunmore/index.js";
+import { dunmoreNswMessages } from "./dunmore/DunmoreMessages.js";
 import { NewSouthWalesCityCode } from "./NewSouthWalesCityCode.js";
-import { DepartmentMessages } from "../../../country/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export const newSouthWales_en = DepartmentMessages.create("New South Wales", {
     [NewSouthWalesCityCode.Dunmore]: dunmoreNswMessages
 });

package/dist/org/au/region/nsw/NewSouthWalesMessages_fr.d.ts

@@ -1,4 +1,4 @@
-import { DepartmentMessages } from "../../../country/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export declare const newSouthWales_fr: DepartmentMessages<{
-    "2529": import("../../../country/index.js").CityMessages;
+    "2529": import("../../../index.js").CityMessages;
 }>;

package/dist/org/au/region/nsw/NewSouthWalesMessages_fr.js

@@ -1,6 +1,6 @@
 import { NewSouthWalesCityCode } from "./NewSouthWalesCityCode.js";
-import { dunmoreNswMessages } from "./dunmore/index.js";
-import { DepartmentMessages } from "../../../country/index.js";
+import { dunmoreNswMessages } from "./dunmore/DunmoreMessages.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export const newSouthWales_fr = DepartmentMessages.create("Nouvelle-Galles du Sud", {
     [NewSouthWalesCityCode.Dunmore]: dunmoreNswMessages
 });

package/dist/org/au/region/nsw/dunmore/DunmoreMessages.d.ts

@@ -1,2 +1,2 @@
-import { CityMessages } from "../../../../country/index.js";
+import { CityMessages } from "../../../../country/region/department/city/CityMessages.js";
 export declare const dunmoreNswMessages: CityMessages;

package/dist/org/au/region/nsw/dunmore/DunmoreMessages.js

@@ -1,2 +1,2 @@
-import { CityMessages } from "../../../../country/index.js";
+import { CityMessages } from "../../../../country/region/department/city/CityMessages.js";
 export const dunmoreNswMessages = CityMessages.create("Dunmore");

package/dist/org/au/region/sa/SouthAustraliaCities.d.ts

@@ -1,2 +1,2 @@
-import { City } from "../../../country/index.js";
+import { City } from "../../../country/region/department/city/City.js";
 export declare const southAustraliaCities: City[];

package/dist/org/au/region/sa/SouthAustraliaMessages_en.d.ts

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export declare const southAustralia_en: RegionMessages<{}>;

package/dist/org/au/region/sa/SouthAustraliaMessages_en.js

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export const southAustralia_en = RegionMessages.create("South Australia", {});

package/dist/org/au/region/sa/SouthAustraliaMessages_fr.d.ts

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export declare const southAustralia_fr: RegionMessages<{}>;

package/dist/org/au/region/sa/SouthAustraliaMessages_fr.js

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export const southAustralia_fr = RegionMessages.create("Australie-Méridionale", {});

package/dist/org/au/region/vic/VictoriaCities.d.ts

@@ -1,2 +1,2 @@
-import { City } from "../../../country/index.js";
+import { City } from "../../../country/region/department/city/City.js";
 export declare const victoriaCities: City[];

package/dist/org/au/region/vic/VictoriaMessages_en.d.ts

@@ -1,4 +1,4 @@
-import { DepartmentMessages } from "../../../country/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export declare const victoria_en: DepartmentMessages<{
-    "3000": import("../../../country/index.js").CityMessages;
+    "3000": import("../../../index.js").CityMessages;
 }>;

package/dist/org/au/region/vic/VictoriaMessages_en.js

@@ -1,6 +1,6 @@
-import { melbourneVicMessages } from "./melbourne/index.js";
+import { melbourneVicMessages } from "./melbourne/MelbourneMessages.js";
 import { VictoriaCityCode } from "./VictoriaCityCode.js";
-import { DepartmentMessages } from "../../../country/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export const victoria_en = DepartmentMessages.create("Victoria", {
     [VictoriaCityCode.Melbourne]: melbourneVicMessages
 });

package/dist/org/au/region/vic/VictoriaMessages_fr.d.ts

@@ -1,4 +1,4 @@
-import { DepartmentMessages } from "../../../country/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
 export declare const victoria_fr: DepartmentMessages<{
-    "3000": import("../../../country/index.js").CityMessages;
+    "3000": import("../../../index.js").CityMessages;
 }>;

package/dist/org/au/region/vic/VictoriaMessages_fr.js

@@ -1,6 +1,6 @@
 import { VictoriaCityCode } from "./VictoriaCityCode.js";
-import { DepartmentMessages } from "../../../country/index.js";
-import { melbourneVicMessages } from "./melbourne/index.js";
+import { DepartmentMessages } from "../../../country/region/department/DepartmentMessages.js";
+import { melbourneVicMessages } from "./melbourne/MelbourneMessages.js";
 export const victoria_fr = DepartmentMessages.create("Victoria", {
     [VictoriaCityCode.Melbourne]: melbourneVicMessages
 });

package/dist/org/au/region/vic/melbourne/MelbourneMessages.d.ts

@@ -1,2 +1,2 @@
-import { CityMessages } from "../../../../country/index.js";
+import { CityMessages } from "../../../../country/region/department/city/CityMessages.js";
 export declare const melbourneVicMessages: CityMessages;

package/dist/org/au/region/vic/melbourne/MelbourneMessages.js

@@ -1,2 +1,2 @@
-import { CityMessages } from "../../../../country/index.js";
+import { CityMessages } from "../../../../country/region/department/city/CityMessages.js";
 export const melbourneVicMessages = CityMessages.create("Melbourne");

package/dist/org/au/region/wa/WesternAustraliaCities.d.ts

@@ -1,2 +1,2 @@
-import { City } from "../../../country/index.js";
+import { City } from "../../../country/region/department/city/City.js";
 export declare const westernAustraliaCities: City[];

package/dist/org/au/region/wa/WesternAustraliaMessages_en.d.ts

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export declare const westernAustralia_en: RegionMessages<{}>;

package/dist/org/au/region/wa/WesternAustraliaMessages_en.js

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export const westernAustralia_en = RegionMessages.create("Western Australia", {});

package/dist/org/au/region/wa/WesternAustraliaMessages_fr.d.ts

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export declare const westernAustralia_fr: RegionMessages<{}>;

package/dist/org/au/region/wa/WesternAustraliaMessages_fr.js

@@ -1,2 +1,2 @@
-import { RegionMessages } from "../../../country/index.js";
+import { RegionMessages } from "../../../country/region/RegionMessages.js";
 export const westernAustralia_fr = RegionMessages.create("Australie-Occidentale", {});