@rr0/cms 0.3.61 → 0.3.63

package/dist/time/TimeContext.test.mjs

@@ -1,83 +1,84 @@
 import { TimeContext } from "./TimeContext.mjs";
-import { describe, test } from "node:test";
-import assert from "node:assert";
+import { describe, expect, test } from "vitest";
 describe("TimeContext", () => {
     const timeContext = new TimeContext();
     const SECOND = 1000;
     test("duration seconds", () => {
         timeContext.updateFromStr("P10S");
         const value = timeContext.duration.value;
-        assert.equal(value, 10 * SECOND);
+        expect(value).toBe(10 * SECOND);
     });
     test("updateFromStr year", () => {
         timeContext.updateFromStr("1989");
-        assert.equal(timeContext.from, undefined);
-        assert.equal(timeContext.getYear(), 1989);
+        // undefined here and null at the other two below: TimeContext is not consistent about which
+        // it returns, and the loose assert.equal this was written with could not tell them apart.
+        expect(timeContext.from).toBeUndefined();
+        expect(timeContext.getYear()).toBe(1989);
     });
     test("updateFromStr year interval", () => {
         timeContext.updateFromStr("1989/2001");
         const toYearVal = timeContext.to.year;
         const toYear = toYearVal.value;
-        assert.equal(toYear, 2001);
+        expect(toYear).toBe(2001);
         const fromYearVal = timeContext.from.year;
         const fromYear = fromYearVal.value;
-        assert.equal(fromYear, 1989);
+        expect(fromYear).toBe(1989);
     });
     test("updateFromStr year from", () => {
         timeContext.updateFromStr("1989/");
         const fromYearVal = timeContext.from.year;
         const fromYear = fromYearVal.value;
-        assert.equal(fromYear, 1989);
-        assert.equal(timeContext.to, undefined);
-        assert.equal(timeContext.getYear(), undefined);
+        expect(fromYear).toBe(1989);
+        expect(timeContext.to).toBeNull();
+        expect(timeContext.getYear()).toBe(undefined);
     });
     test("updateFromStr year to", () => {
         timeContext.updateFromStr("/2001");
-        assert.equal(timeContext.from, undefined);
+        expect(timeContext.from).toBeNull();
         const toYearVal = timeContext.to.year;
         const toYear = toYearVal.value;
-        assert.equal(toYear, 2001);
-        assert.equal(timeContext.getYear(), undefined);
+        expect(toYear).toBe(2001);
+        expect(timeContext.getYear()).toBe(undefined);
     });
     test("updateFromStr year-month", () => {
         timeContext.updateFromStr("1989-10");
-        assert.equal(timeContext.getYear(), 1989);
-        assert.equal(timeContext.getMonth(), 10);
+        expect(timeContext.getYear()).toBe(1989);
+        expect(timeContext.getMonth()).toBe(10);
     });
     test("updateFromStr year-month-day", () => {
         timeContext.updateFromStr("1989-10-25");
-        assert.equal(timeContext.getYear(), 1989);
-        assert.equal(timeContext.getMonth(), 10);
-        assert.equal(timeContext.getDayOfMonth(), 25);
+        expect(timeContext.getYear()).toBe(1989);
+        expect(timeContext.getMonth()).toBe(10);
+        expect(timeContext.getDayOfMonth()).toBe(25);
     });
     test("updateFromStr year-month-day hour:minutes", () => {
         timeContext.updateFromStr("1989-10-25 12:55");
-        assert.equal(timeContext.getYear(), 1989);
-        assert.equal(timeContext.getMonth(), 10);
-        assert.equal(timeContext.getDayOfMonth(), 25);
-        assert.equal(timeContext.getHour(), 12);
-        assert.equal(timeContext.getMinutes(), 55);
+        expect(timeContext.getYear()).toBe(1989);
+        expect(timeContext.getMonth()).toBe(10);
+        expect(timeContext.getDayOfMonth()).toBe(25);
+        expect(timeContext.getHour()).toBe(12);
+        expect(timeContext.getMinutes()).toBe(55);
     });
     test("fromDate", () => {
         const month = 12;
         const date = new Date(2001, month - 1, 13);
         const timeContext = TimeContext.fromDate(date);
-        assert.equal(timeContext.getYear(), 2001);
-        assert.equal(timeContext.getMonth(), month);
-        assert.equal(timeContext.getDayOfMonth(), 13);
+        expect(timeContext.getYear()).toBe(2001);
+        expect(timeContext.getMonth()).toBe(month);
+        expect(timeContext.getDayOfMonth()).toBe(13);
     });
     test("clone", () => {
         timeContext.updateFromStr("2006-07-14T17:56");
-        assert.equal(timeContext.getYear(), 2006);
-        assert.equal(timeContext.getMonth(), 7);
-        assert.equal(timeContext.getDayOfMonth(), 14);
-        assert.equal(timeContext.getHour(), 17);
-        assert.equal(timeContext.getMinutes(), 56);
+        expect(timeContext.getYear()).toBe(2006);
+        expect(timeContext.getMonth()).toBe(7);
+        expect(timeContext.getDayOfMonth()).toBe(14);
+        expect(timeContext.getHour()).toBe(17);
+        expect(timeContext.getMinutes()).toBe(56);
         const clone = timeContext.clone();
-        assert.equal(clone.getYear(), 2006);
-        assert.equal(clone.getMonth(), 7);
-        assert.equal(clone.getDayOfMonth(), 14);
-        assert.equal(clone.getHour(), 17);
-        assert.equal(clone.getMinutes(), 56);
+        expect(clone.getYear()).toBe(2006);
+        expect(clone.getMonth()).toBe(7);
+        expect(clone.getDayOfMonth()).toBe(14);
+        expect(clone.getHour()).toBe(17);
+        expect(clone.getMinutes()).toBe(56);
     });
 });

package/dist/time/TimeDirectoryStep.d.ts

@@ -2,7 +2,7 @@ import { DirectoryStep, FileWriteConfig, OutputFunc } from "ssg-api";
 import { TimeService } from "./TimeService.js";
 import { HtmlRR0Context, RR0Context } from "../RR0Context.js";
 import { RR0Event } from "@rr0/data";
-import { TimeElementFactory } from "./html/index.js";
+import { TimeElementFactory } from "./html/TimeElementFactory.js";
 /**
  * Builds a directory page for UFO times.
  */

package/dist/time/TimeDirectoryStep.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 page for UFO times.
  */

package/dist/time/TimeDirectoryStep.test.js

@@ -1,11 +1,11 @@
-import { describe, expect, test } from "@javarome/testscript";
+import { describe, expect, test } from "vitest";
 import { TimeDirectoryStep } from "./TimeDirectoryStep.js";
-import { cmsTestUtil } from "../test/index.js";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
 import { getTimeFiles } from "../CMSGenerator.test.js";
 import path from "path";
 import { TimeService } from "./TimeService.js";
 import { AllDataService, RR0EventFactory } from "@rr0/data";
-import { TimeElementFactory } from "./html/index.js";
+import { TimeElementFactory } from "./html/TimeElementFactory.js";
 describe("TimeDirectoryStep", () => {
     async function outputFunc(context, info, outDir = cmsTestUtil.outDir + "/") {
         info.name = `${outDir}${info.name}`;

package/dist/time/TimeEventRenderer.test.js

@@ -1,10 +1,12 @@
-import { describe, expect, test } from "@javarome/testscript";
+import { describe, expect, test } from "vitest";
 import { CaseSummaryRenderer } from "./CaseSummaryRenderer.js";
-import { cmsTestUtil } from "../test/index.js";
-import { HttpSource } from "./datasource/index.js";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
+import { HttpSource } from "./datasource/HttpSource.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
-import { SourceFactory, SourceRenderer } from "../source/index.js";
-import { NoteFileCounter, NoteRenderer } from "../note/index.js";
+import { SourceFactory } from "../source/SourceFactory.js";
+import { SourceRenderer } from "../source/SourceRenderer.js";
+import { NoteFileCounter } from "../note/NoteFileCounter.js";
+import { NoteRenderer } from "../note/NoteRenderer.js";
 import { HautsDeSeineCityCode } from "../org/eu/fr/region/idf/92/HautsDeSeineCityCode.js";
 import { AllDataService } from "@rr0/data";
 import { Place } from "@rr0/place";

package/dist/time/TimeService.js

@@ -1,6 +1,6 @@
 import { AbstractDataService, EventDataFactory, RR0EventFactory } from "@rr0/data";
 import { RR0ContextImpl } from "../RR0Context.js";
-import { StringUtil } from "../util/index.js";
+import { StringUtil } from "../util/string/StringUtil.js";
 export class TimeService extends AbstractDataService {
     constructor(dataService, options, timePathRegex = TimeService.defaultRegex) {
         super(dataService, new EventDataFactory(new RR0EventFactory(), ["birth", "death", "image", "book", "article", "sighting", "nationality", "move", "occupation"], options.files), options.files);

package/dist/time/TimeService.test.js

@@ -1,6 +1,6 @@
 import { RR0ContextImpl } from "../RR0Context.js";
-import { describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../test/index.js";
+import { describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
 import { FileContents } from "@javarome/fileutil";
 import { TimeContext } from "./TimeContext.mjs";
 describe("Time", () => {

package/dist/time/TimeTagReplaceCommand.test.js

@@ -1,6 +1,6 @@
 import { TimeReplacerFactory } from "./html/TimeReplacerFactory.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 { DomReplaceCommand } from "ssg-api";
 import { TimeReplacer } from "./html/TimeReplacer.js";
 import path from "path";

package/dist/time/TimeTestUtil.d.ts

@@ -1,5 +1,9 @@
-import { TimeElementFactory, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
-import { CMSTestUtil } from "../test/index.js";
+import { TimeService } from "./TimeService.js";
+import { TimeUrlBuilder } from "./TimeUrlBuilder.js";
+import { TimeElementFactory } from "./html/TimeElementFactory.js";
+import { TimeRenderer } from "./html/TimeRenderer.js";
+import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
+import { CMSTestUtil } from "../test/CMSTestUtil.js";
 import { HtmlRR0Context } from "../RR0Context.js";
 import { TimeOptions } from "./TimeOptions.js";
 export declare class TimeTestUtil {

package/dist/time/TimeTestUtil.js

@@ -1,6 +1,10 @@
 import path from "path";
-import { TimeElementFactory, TimeRenderer, TimeService, TimeTextBuilder, TimeUrlBuilder } from "../time/index.js";
-import { cmsTestUtil } from "../test/index.js";
+import { TimeService } from "./TimeService.js";
+import { TimeUrlBuilder } from "./TimeUrlBuilder.js";
+import { TimeElementFactory } from "./html/TimeElementFactory.js";
+import { TimeRenderer } from "./html/TimeRenderer.js";
+import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
 export class TimeTestUtil {
     constructor(cmsTestUtil) {
         this.timeOptions = { rootDir: "time", files: [] };

package/dist/time/TimeUrlBuilder.test.js

@@ -1,7 +1,7 @@
 import { TimeUrlBuilder } from "./TimeUrlBuilder.js";
 import { RR0ContextImpl } from "../RR0Context.js";
-import { describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../test/index.js";
+import { describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../test/CMSTestUtil.js";
 import path from "path";
 import { TimeContext } from "./TimeContext.mjs";
 describe("TimeUrlBuilder", () => {

package/dist/time/TitleReplaceCommand.test.js

@@ -1,6 +1,6 @@
 import { SsiTitleReplaceCommand } from "./SsiTitleReplaceCommand.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("TitleReplaceCommand", () => {
     let timeTextBuilder = cmsTestUtil.time.timeTextBuilder;
     const timeDefaultHandler = (context) => cmsTestUtil.time.getService().titleFromFile(context, context.file.name, timeTextBuilder);

package/dist/time/datasource/ChronologyReplacer.test.js

@@ -1,9 +1,11 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
+import { beforeEach, describe, test } from "vitest";
 import { ChronologyReplacer } from "./ChronologyReplacer.js";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
-import { cmsTestUtil } from "../../test/index.js";
-import { SourceFactory, SourceRenderer } from "../../source/index.js";
-import { NoteFileCounter, NoteRenderer } from "../../note/index.js";
+import { cmsTestUtil } from "../../test/CMSTestUtil.js";
+import { SourceFactory } from "../../source/SourceFactory.js";
+import { SourceRenderer } from "../../source/SourceRenderer.js";
+import { NoteFileCounter } from "../../note/NoteFileCounter.js";
+import { NoteRenderer } from "../../note/NoteRenderer.js";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { HttpSource } from "./HttpSource.js";
 import { AllDataService } from "@rr0/data";

package/dist/time/datasource/CsvMapper.test.js

@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
+import { beforeEach, describe, expect, test } from "vitest";
 import fs from "fs";
 import { CsvMapper } from "./CsvMapper.js";
-import { cmsTestUtil } from "../../test/index.js";
+import { cmsTestUtil } from "../../test/CMSTestUtil.js";
 import path from "path";
 import * as process from "node:process";
 import { geipanTestCaseSummaries } from "../../org/eu/fr/cnes/geipan/geipan/GeipanTestCases.js";

package/dist/time/datasource/DatasourceTestCase.d.ts

@@ -1,7 +1,7 @@
 import { HtmlRR0Context } from "../../RR0Context.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
-import { RR0CaseMapping } from "./rr0/index.js";
+import { RR0CaseMapping } from "./rr0/RR0CaseMapping.js";
 import { RR0SourceType, Source } from "@rr0/data";
 import { PlaceRenderer } from "../../place/PlaceRenderer.js";
 export declare abstract class DatasourceTestCase<S> {

package/dist/time/datasource/DatasourceTestCase.js

@@ -1,12 +1,14 @@
-import { expect } from "@javarome/testscript";
+import { expect } from "vitest";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
-import { SourceFactory, SourceRenderer } from "../../source/index.js";
-import { NoteFileCounter, NoteRenderer } from "../../note/index.js";
+import { SourceFactory } from "../../source/SourceFactory.js";
+import { SourceRenderer } from "../../source/SourceRenderer.js";
+import { NoteFileCounter } from "../../note/NoteFileCounter.js";
+import { NoteRenderer } from "../../note/NoteRenderer.js";
 import { HttpSource } from "./HttpSource.js";
 import { TimeElementFactory } from "../html/TimeElementFactory.js";
 import { TimeRenderer } from "../html/TimeRenderer.js";
-import { cmsTestUtil } from "../../test/index.js";
+import { cmsTestUtil } from "../../test/CMSTestUtil.js";
 import { AllDataService } from "@rr0/data";
 import { PlaceRenderer } from "../../place/PlaceRenderer.js";
 export class DatasourceTestCase {

package/dist/time/datasource/JsonMapper.test.js

@@ -1,9 +1,9 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
+import { beforeEach, describe, expect, test } from "vitest";
 import fs from "fs";
-import { cmsTestUtil } from "../../test/index.js";
+import { cmsTestUtil } from "../../test/CMSTestUtil.js";
 import { ufoSearchTestCases } from "./ufo-search/UfoSearchTestCases.js";
 import path from "path";
-import { UfoSearchRR0Mapping } from "./ufo-search/index.js";
+import { UfoSearchRR0Mapping } from "./ufo-search/UfoSearchMapping.js";
 describe("JsonMapper", () => {
     let context;
     beforeEach(() => {

package/dist/time/datasource/TimeContextFilter.test.js

@@ -1,6 +1,6 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
+import { beforeEach, describe, expect, test } from "vitest";
 import { TimeContextFilter } from "./TimeContextFilter.js";
-import { cmsTestUtil } from "../../test/index.js";
+import { cmsTestUtil } from "../../test/CMSTestUtil.js";
 describe("TimeContextFilter", () => {
     let context;
     beforeEach(() => {

package/dist/time/datasource/acufo/AcufoDatasource.js

@@ -1,8 +1,9 @@
 import { HttpSource } from "../HttpSource.js";
 import { JSDOM } from "jsdom";
-import { ObjectUtil } from "../../../util/index.js";
+import { ObjectUtil } from "../../../util/ObjectUtil.js";
 import assert from "assert";
-import { NuforcCountry, NuforcShape } from "../nuforc/index.js";
+import { NuforcCountry } from "../nuforc/NuforcCountry.js";
+import { NuforcShape } from "../nuforc/NuforcShape.js";
 import { AbstractDatasource } from "../AbstractDatasource.js";
 export class AcufoDatasource extends AbstractDatasource {
     constructor(baseUrl = "https://ufologie.patrickgross.org", searchPath = "alsacat") {

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.d.ts

@@ -3,7 +3,7 @@ import { BaseOvniFranceCaseSummary } from "./BaseOvniFranceCaseSummary.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
 import { DepartmentService } from "../../../org/country/region/department/DepartmentService.js";
-import { CityService } from "../../../org/country/index.js";
+import { CityService } from "../../../org/country/region/department/city/CityService.js";
 /**
  * Maps a Base OVNI France case to a RR0 case.
  */

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
 import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
 import { baseOvniFranceDatasource } from "./BaseOvniFranceRR0Mapping.js";

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCsv.test.js

@@ -1,6 +1,6 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
+import { beforeEach, describe, expect, test } from "vitest";
 import { CsvMapper } from "../CsvMapper.js";
-import { cmsTestUtil } from "../../../test/index.js";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
 import fs from "fs";
 import { baseOvniFranceDatasource, baseOvniFranceSortComparator } from "./BaseOvniFranceRR0Mapping.js";

package/dist/time/datasource/baseovnifrance/BaseOvniFranceDatasource.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { BaseOvniFranceRR0Mapping, baseOvniFranceSortComparator } from "./BaseOvniFranceRR0Mapping.js";

package/dist/time/datasource/baseovnifrance/BaseOvniFranceHttpDatasource.js

@@ -1,5 +1,5 @@
 import { HttpSource } from "../HttpSource.js";
-import { UrlUtil } from "../../../util/index.js";
+import { UrlUtil } from "../../../util/url/UrlUtil.js";
 import { JSDOM } from "jsdom";
 import { Level2Date as EdtfDate, Level2Timeshift } from "@rr0/time";
 import assert from "assert";

package/dist/time/datasource/baseovnifrance/BaseOvniFranceRR0Mapping.d.ts

@@ -1,7 +1,7 @@
 import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryRR0Mapper.js";
 import { BaseOvniFranceCaseSummary } from "./BaseOvniFranceCaseSummary.js";
 import { BaseOvniFranceHttpDatasource } from "./BaseOvniFranceHttpDatasource.js";
-import { RR0CaseMapping } from "../rr0/index.js";
+import { RR0CaseMapping } from "../rr0/RR0CaseMapping.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { CMSContext } from "../../../CMSContext.js";
 export declare const baseOvniFranceDatasource: BaseOvniFranceHttpDatasource;

package/dist/time/datasource/fufora/FuforaCaseSummaryRR0Mapper.d.ts

@@ -2,7 +2,7 @@ import { CaseMapper } from "../CaseMapper.js";
 import { FuforaCaseSummary } from "./FuforaCaseSummary.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
-import { CityService } from "../../../org/country/index.js";
+import { CityService } from "../../../org/country/region/department/city/CityService.js";
 /**
  * Maps FUFORA cases to RR0 cases.
  */

package/dist/time/datasource/fufora/FuforaDatasource.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { fuforaTestCases } from "./FuforaTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { FuforaRR0Mapping } from "./FuforaRR0Mapping.js";

package/dist/time/datasource/fufora/FuforaHttpDatasource.js

@@ -1,5 +1,5 @@
 import { HttpSource } from "../HttpSource.js";
-import { UrlUtil } from "../../../util/index.js";
+import { UrlUtil } from "../../../util/url/UrlUtil.js";
 import { JSDOM } from "jsdom";
 import { FuforaDatasource } from "./FuforaDatasource.js";
 import { Level2Date as EdtfDate } from "@rr0/time";

package/dist/time/datasource/nuforc/NuforcDatasource.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { nuforcTestCases } from "./NuforcTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { NuforcRR0Mapping } from "./NuforcRR0Mapping.js";

package/dist/time/datasource/nuforc/NuforcHttpDatasource.js

@@ -1,5 +1,5 @@
 import { HttpSource } from "../HttpSource.js";
-import { UrlUtil } from "../../../util/index.js";
+import { UrlUtil } from "../../../util/url/UrlUtil.js";
 import { ObjectUtil } from "../../../util/ObjectUtil.js";
 import { NuforcState } from "./NuforcState.js";
 import assert from "assert";

package/dist/time/datasource/nuforc/NuforcRR0Mapper.d.ts

@@ -4,7 +4,7 @@ import { HtmlRR0Context } from "../../../RR0Context.js";
 import { NuforcCountry } from "./NuforcCountry.js";
 import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
 import { NuforcShape } from "./NuforcShape.js";
-import { CityService } from "../../../org/country/index.js";
+import { CityService } from "../../../org/country/region/department/city/CityService.js";
 import { CountryService } from "../../../org/country/CountryService.js";
 export declare class NuforcRR0Mapper implements CaseMapper<HtmlRR0Context, NuforcCaseSummary, RR0CaseSummary> {
     protected cityService: CityService;

package/dist/time/datasource/nuforc/NuforcRR0Mapper.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
 import { nuforcDatasource } from "./NuforcRR0Mapping.js";
 import { nuforcTestCases } from "./NuforcTestCases.js";

package/dist/time/datasource/rr0/RR0Datasource.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { rr0TestCases } from "./RR0TestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { Level2Date as EdtfDate } from "@rr0/time";

package/dist/time/datasource/rr0/RR0FileDatasource.test.js

@@ -1,5 +1,5 @@
-import { describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { rr0TestCases } from "./RR0TestCases.js";
 import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";

package/dist/time/datasource/rr0/RR0HttpDatasource.d.ts

@@ -2,7 +2,7 @@ import { HtmlRR0Context } from "../../../RR0Context.js";
 import { HttpSource } from "../HttpSource.js";
 import { RR0Datasource } from "./RR0Datasource.js";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
-import { CityService } from "../../../org/index.js";
+import { CityService } from "../../../org/country/region/department/city/CityService.js";
 import { RR0SourceType, Source } from "@rr0/data";
 import { Place } from "@rr0/place";
 export declare class RR0HttpDatasource extends RR0Datasource {

package/dist/time/datasource/rr0/RR0HttpDatasource.js

@@ -1,5 +1,5 @@
 import { HttpSource } from "../HttpSource.js";
-import { UrlUtil } from "../../../util/index.js";
+import { UrlUtil } from "../../../util/url/UrlUtil.js";
 import { RR0Datasource } from "./RR0Datasource.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
 import { NamedPlace } from "@rr0/place";

package/dist/time/datasource/rr0/RR0TestCases.js

@@ -1,5 +1,5 @@
 import { Level2Date as EdtfDate } from "@rr0/time";
-import { UrlUtil } from "../../../util/index.js";
+import { UrlUtil } from "../../../util/url/UrlUtil.js";
 import { RR0HttpDatasource } from "./RR0HttpDatasource.js";
 import { RR0Mapping } from "./RR0Mapping.js";
 import { NamedPlace } from "@rr0/place";

package/dist/time/datasource/sceau/SceauCaseMapping.d.ts

@@ -1,5 +1,5 @@
 import { SceauCaseSummary } from "./SceauCaseSummary.js";
-import { RR0CaseMapping } from "../rr0/index.js";
+import { RR0CaseMapping } from "../rr0/RR0CaseMapping.js";
 /**
  * Maps a SCEAU case to a RR0 case.
  */

package/dist/time/datasource/sceau/SceauCaseSummaryRR0Mapper.d.ts

@@ -1,8 +1,8 @@
 import { CaseMapper } from "../CaseMapper.js";
 import { SceauCaseSummary } from "./SceauCaseSummary.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
-import { RR0CaseSummary } from "../rr0/index.js";
-import { CityService } from "../../../org/index.js";
+import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
+import { CityService } from "../../../org/country/region/department/city/CityService.js";
 /**
  * Maps SCEAU cases to RR0 cases.
  */

package/dist/time/datasource/sceau/SceauDatasource.test.js

@@ -1,10 +1,10 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
+import { beforeEach, describe, test } from "vitest";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { Level2Date as EdtfDate } from "@rr0/time";
-import { HtmlTag } from "../../../util/index.js";
+import { HtmlTag } from "../../../util/html/HtmlTag.js";
 import { SceauDatasource } from "./SceauDatasource.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
-import { cmsTestUtil } from "../../../test/index.js";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { sceauDatasource } from "./SceauRR0Mapping.js";
 import { sceauTestCases } from "./SceauTestCases.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper.js";

package/dist/time/datasource/sceau/SceauRR0Mapping.d.ts

@@ -1,5 +1,5 @@
 import { SceauHttpDatasource } from "./SceauHttpDatasource.js";
-import { RR0CaseMapping } from "../rr0/index.js";
+import { RR0CaseMapping } from "../rr0/RR0CaseMapping.js";
 import { SceauCaseSummary } from "./SceauCaseSummary.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { SceauCaseSummaryRR0Mapper } from "./SceauCaseSummaryRR0Mapper.js";

package/dist/time/datasource/ufo-search/UfoSearchCaseRR0Mapper.d.ts

@@ -1,8 +1,8 @@
 import { CaseMapper } from "../CaseMapper.js";
 import { UfoSearchCase } from "./UfoSearchCase.js";
 import { HtmlRR0Context } from "../../../RR0Context.js";
-import { RR0CaseSummary } from "../rr0/index.js";
-import { CityService } from "../../../org/index.js";
+import { RR0CaseSummary } from "../rr0/RR0CaseSummary.js";
+import { CityService } from "../../../org/country/region/department/city/CityService.js";
 import { OrganizationPlace } from "../../../place/OrganizationPlace.js";
 export declare class UfoSearchCaseRR0Mapper implements CaseMapper<HtmlRR0Context, UfoSearchCase, RR0CaseSummary> {
     protected cityService: CityService;

package/dist/time/datasource/ufo-search/UfoSearchDatasource.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { ufoSearchTestCases } from "./UfoSearchTestCases.js";
 import { UfoSearchRR0Mapping } from "./UfoSearchMapping.js";

package/dist/time/datasource/ufo-search/UfoSearchHttpDatasource.js

@@ -1,5 +1,5 @@
 import { UfoSearchDatasource } from "./UfoSearchDatasource.js";
-import { UrlUtil } from "../../../util/index.js";
+import { UrlUtil } from "../../../util/url/UrlUtil.js";
 import { JSDOM } from "jsdom";
 import { HttpSource } from "../HttpSource.js";
 import { By } from "selenium-webdriver";

package/dist/time/datasource/urecat/UrecatDatasource.test.js

@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { cmsTestUtil } from "../../../test/index.js";
+import { beforeEach, describe, expect, test } from "vitest";
+import { cmsTestUtil } from "../../../test/CMSTestUtil.js";
 import { urecatTestCases } from "./UrecatTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
 import { UrecatRR0Mapping } from "./UrecatRR0Mapping.js";